diff --git a/.gitignore b/.gitignore index 2c4d871e..a857fa1c 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,8 @@ javacore.* local.properties src-gen/ tmp/ +.project +.classpath # Maven .mvn/timing.properties diff --git a/.gitmodules b/.gitmodules index 49f5a6a5..574c7af2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,24 +1,24 @@ [submodule "tests/org.emftext.language.java.test/JaMoPP-BulkTest"] - path = tests/org.emftext.language.java.test/JaMoPP-BulkTest + path = tests/org.emftext.language.java.test/target/src-bulk/JaMoPP-BulkTest url = https://github.com/DevBoost/JaMoPP-BulkTest [submodule "tests/org.emftext.language.java.test/TeaStore"] - path = tests/org.emftext.language.java.test/TeaStore + path = tests/org.emftext.language.java.test/target/src-bulk/TeaStore url = https://github.com/DescartesResearch/TeaStore [submodule "tests/org.emftext.language.java.test/teammates"] - path = tests/org.emftext.language.java.test/teammates + path = tests/org.emftext.language.java.test/target/src-bulk/teammates url = https://github.com/TEAMMATES/teammates [submodule "tests/org.emftext.language.java.test/microservice"] - path = tests/org.emftext.language.java.test/microservice + path = tests/org.emftext.language.java.test/target/src-bulk/microservice url = https://github.com/ewolff/microservice [submodule "tests/org.emftext.language.java.test/esda"] - path = tests/org.emftext.language.java.test/esda + path = tests/org.emftext.language.java.test/target/src-bulk/esda url = https://github.com/kit-sdq/esda [submodule "tests/org.emftext.language.java.test/acmeair"] - path = tests/org.emftext.language.java.test/acmeair + path = tests/org.emftext.language.java.test/target/src-bulk/acmeair url = https://github.com/acmeair/acmeair.git [submodule "tests/org.emftext.language.java.test/piggymetrics"] - path = tests/org.emftext.language.java.test/piggymetrics + path = tests/org.emftext.language.java.test/target/src-bulk/piggymetrics url = https://github.com/sqshq/piggymetrics.git [submodule "tests/org.emftext.language.java.test/petclinic"] - path = tests/org.emftext.language.java.test/petclinic + path = tests/org.emftext.language.java.test/target/src-bulk/petclinic url = https://github.com/spring-petclinic/spring-petclinic-microservices.git diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml deleted file mode 100644 index 1feaecb9..00000000 --- a/.mvn/extensions.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - org.eclipse.tycho - tycho-build - 2.7.5 - - - org.palladiosimulator - tycho-tp-refresh-maven-plugin - 0.2.6 - - diff --git a/.project b/.project deleted file mode 100644 index d3a4cc05..00000000 --- a/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - Palladio-Supporting-EclipseJavaDevelopmentTools - - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - - diff --git a/CHANGELOG.md b/CHANGELOG.md index 34a53a86..d10203fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), - Minimum required Java version: Java 17 - Supported Eclipse version: 2022-12 - Third variant: bindings of parameters and local variables are also resolved +- Migration to MDSD Tools organization + - Converted Maven Tycho-based build to pure Maven build +- Upgraded dependency versions to: + - Apache Commons Bytecode Engineering Library 6.7.0 + - Apache Log4j 2 2.20.0 including the Log4j 1.x bridge ### Deprecated @@ -27,7 +32,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), ## [5.1.0] - 2022-01-21 -From here, independent development by the Institute of Information Security and Dependability (KASTEL) at the Karlsruher Institute of Technology (KIT) resulting in the following changes. +From here, independent development by the Modelling for Continuous Software Engineering (MCSE) group at the Institute of Information Security and Dependability (KASTEL) at the Karlsruher Institute of Technology (KIT) resulting in the following changes. ### Added @@ -88,7 +93,7 @@ Originally, developed by DevBoost GmbH and Software Technology Group, Dresden Un - Tests for the parsing (checks if generated model contains the expected elements) - Tests for the parsing and printing (checks if printed code is equal to parsed code by parsing both source codes with Eclipse JDT and comparing the resulting ASTs) -[Unreleased]: https://github.com/PalladioSimulator/Palladio-Supporting-EclipseJavaDevelopmentTools/compare/releases/5.1.0...HEAD -[5.1.0]: https://github.com/PalladioSimulator/Palladio-Supporting-EclipseJavaDevelopmentTools/compare/8bc07...releases/5.1.0 -[development after 1.4.0]: https://github.com/PalladioSimulator/Palladio-Supporting-EclipseJavaDevelopmentTools/compare/e46b0...8bc07 -[1.4.0]: https://github.com/PalladioSimulator/Palladio-Supporting-EclipseJavaDevelopmentTools/commit/e46b0003803a8ccda7c3aa380ff2c759937d1ccb \ No newline at end of file +[Unreleased]: https://github.com/MDSD-Tools/TheExtendedJavaModelParserAndPrinter/compare/releases/5.1.0...HEAD +[5.1.0]: https://github.com/MDSD-Tools/TheExtendedJavaModelParserAndPrinter/compare/8bc07...releases/5.1.0 +[development after 1.4.0]: https://github.com/MDSD-Tools/TheExtendedJavaModelParserAndPrinter/compare/e46b0...8bc07 +[1.4.0]: https://github.com/MDSD-Tools/TheExtendedJavaModelParserAndPrinter/commit/e46b0003803a8ccda7c3aa380ff2c759937d1ccb diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index b18fffa0..00000000 --- a/Jenkinsfile +++ /dev/null @@ -1,4 +0,0 @@ -PalladioPipeline { - constraintBuildTimeLimitMinutes = 45 - deployUpdatesite 'releng/org.palladiosimulator.jdt.updatesite/target/repository' -} diff --git a/bundles/jamopp.parser.bcel/.classpath b/bundles/jamopp.parser.bcel/.classpath deleted file mode 100644 index 4199cd3a..00000000 --- a/bundles/jamopp.parser.bcel/.classpath +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/bundles/jamopp.parser.bcel/.project b/bundles/jamopp.parser.bcel/.project deleted file mode 100644 index 9de32fb1..00000000 --- a/bundles/jamopp.parser.bcel/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - jamopp.parser.bcel - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - net.sf.eclipsecs.core.CheckstyleBuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.pde.PluginNature - net.sf.eclipsecs.core.CheckstyleNature - - diff --git a/bundles/jamopp.parser.bcel/META-INF/MANIFEST.MF b/bundles/jamopp.parser.bcel/META-INF/MANIFEST.MF deleted file mode 100644 index 55267352..00000000 --- a/bundles/jamopp.parser.bcel/META-INF/MANIFEST.MF +++ /dev/null @@ -1,11 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Apache BCEL-based JaMoPP Parser for Class Files -Bundle-SymbolicName: jamopp.parser.bcel -Bundle-Version: 5.1.0.qualifier -Bundle-Vendor: Martin Armbruster -Automatic-Module-Name: jamopp.parser.bcel -Bundle-RequiredExecutionEnvironment: JavaSE-17 -Export-Package: jamopp.parser.bcel -Require-Bundle: org.emftext.language.java, - org.eclipse.emf.common diff --git a/bundles/jamopp.parser.bcel/NOTICE.txt b/bundles/jamopp.parser.bcel/NOTICE.txt deleted file mode 100644 index 711accf8..00000000 --- a/bundles/jamopp.parser.bcel/NOTICE.txt +++ /dev/null @@ -1,5 +0,0 @@ -Apache Commons BCEL -Copyright 2004-2020 The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (https://www.apache.org/). diff --git a/bundles/jamopp.parser.bcel/build.properties b/bundles/jamopp.parser.bcel/build.properties deleted file mode 100644 index 34d2e4d2..00000000 --- a/bundles/jamopp.parser.bcel/build.properties +++ /dev/null @@ -1,4 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - . diff --git a/bundles/jamopp.parser.bcel/pom.xml b/bundles/jamopp.parser.bcel/pom.xml new file mode 100644 index 00000000..787db646 --- /dev/null +++ b/bundles/jamopp.parser.bcel/pom.xml @@ -0,0 +1,48 @@ + + + + 4.0.0 + jamopp.parser.bcel + jar + Apache BCEL-based JaMoPP Parser for Class Files + + + tools.mdsd + jamopp.bundles + 6.0.0-SNAPSHOT + + + + + + org.apache.felix + maven-bundle-plugin + + + + bundle + + + + + + + + + + org.eclipse.emf + org.eclipse.emf.ecore + + + tools.mdsd + org.emftext.language.java + 6.0.0-SNAPSHOT + + + org.apache.bcel + bcel + + + diff --git a/bundles/jamopp.parser.bcel/src/jamopp/parser/bcel/ClassFileModelLoader.java b/bundles/jamopp.parser.bcel/src/main/java/jamopp/parser/bcel/ClassFileModelLoader.java similarity index 100% rename from bundles/jamopp.parser.bcel/src/jamopp/parser/bcel/ClassFileModelLoader.java rename to bundles/jamopp.parser.bcel/src/main/java/jamopp/parser/bcel/ClassFileModelLoader.java diff --git a/bundles/jamopp.parser.bcel/src/jamopp/parser/bcel/package-info.java b/bundles/jamopp.parser.bcel/src/main/java/jamopp/parser/bcel/package-info.java similarity index 100% rename from bundles/jamopp.parser.bcel/src/jamopp/parser/bcel/package-info.java rename to bundles/jamopp.parser.bcel/src/main/java/jamopp/parser/bcel/package-info.java diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/Const.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/Const.java deleted file mode 100644 index b79b0461..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/Const.java +++ /dev/null @@ -1,2438 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel; - -import java.util.Arrays; -import java.util.Collections; - -/** - * Constants for the project, mostly defined in the JVM specification. - * - * @since 6.0 (intended to replace the Constants interface) - */ -public final class Const { - - /** - * Java class file format Magic number (0xCAFEBABE) - * - * @see - * The ClassFile Structure in The Java Virtual Machine Specification - */ - public static final int JVM_CLASSFILE_MAGIC = 0xCAFEBABE; - - /** Major version number of class files for Java 1.1. - * @see #MINOR_1_1 - * */ - public static final short MAJOR_1_1 = 45; - - /** Minor version number of class files for Java 1.1. - * @see #MAJOR_1_1 - * */ - public static final short MINOR_1_1 = 3; - - /** Major version number of class files for Java 1.2. - * @see #MINOR_1_2 - * */ - public static final short MAJOR_1_2 = 46; - - /** Minor version number of class files for Java 1.2. - * @see #MAJOR_1_2 - * */ - public static final short MINOR_1_2 = 0; - - /** Major version number of class files for Java 1.2. - * @see #MINOR_1_2 - * */ - public static final short MAJOR_1_3 = 47; - - /** Minor version number of class files for Java 1.3. - * @see #MAJOR_1_3 - * */ - public static final short MINOR_1_3 = 0; - - /** Major version number of class files for Java 1.3. - * @see #MINOR_1_3 - * */ - public static final short MAJOR_1_4 = 48; - - /** Minor version number of class files for Java 1.4. - * @see #MAJOR_1_4 - * */ - public static final short MINOR_1_4 = 0; - - /** Major version number of class files for Java 1.4. - * @see #MINOR_1_4 - * */ - public static final short MAJOR_1_5 = 49; - - /** Minor version number of class files for Java 1.5. - * @see #MAJOR_1_5 - * */ - public static final short MINOR_1_5 = 0; - - /** Major version number of class files for Java 1.6. - * @see #MINOR_1_6 - * */ - public static final short MAJOR_1_6 = 50; - - /** Minor version number of class files for Java 1.6. - * @see #MAJOR_1_6 - * */ - public static final short MINOR_1_6 = 0; - - /** Major version number of class files for Java 1.7. - * @see #MINOR_1_7 - * */ - public static final short MAJOR_1_7 = 51; - - /** Minor version number of class files for Java 1.7. - * @see #MAJOR_1_7 - * */ - public static final short MINOR_1_7 = 0; - - /** Major version number of class files for Java 1.8. - * @see #MINOR_1_8 - * */ - public static final short MAJOR_1_8 = 52; - - /** Minor version number of class files for Java 1.8. - * @see #MAJOR_1_8 - * */ - public static final short MINOR_1_8 = 0; - - /** Major version number of class files for Java 9. - * @see #MINOR_9 - * */ - public static final short MAJOR_9 = 53; - - /** Minor version number of class files for Java 9. - * @see #MAJOR_9 - * */ - public static final short MINOR_9 = 0; - - /** - * @deprecated Use {@link #MAJOR_9} instead - */ - @Deprecated - public static final short MAJOR_1_9 = MAJOR_9; - - /** - * @deprecated Use {@link #MINOR_9} instead - */ - @Deprecated - public static final short MINOR_1_9 = MINOR_9; - - /** Major version number of class files for Java 10. - * @see #MINOR_10 - * */ - public static final short MAJOR_10 = 54; - - /** Minor version number of class files for Java 10. - * @see #MAJOR_10 - * */ - public static final short MINOR_10 = 0; - - /** Major version number of class files for Java 11. - * @see #MINOR_11 - * */ - public static final short MAJOR_11 = 55; - - /** Minor version number of class files for Java 11. - * @see #MAJOR_11 - * */ - public static final short MINOR_11 = 0; - - /** Major version number of class files for Java 12. - * @see #MINOR_12 - * */ - public static final short MAJOR_12 = 56; - - /** Minor version number of class files for Java 12. - * @see #MAJOR_12 - * */ - public static final short MINOR_12 = 0; - - /** Major version number of class files for Java 13. - * @see #MINOR_13 - * */ - public static final short MAJOR_13 = 57; - - /** Minor version number of class files for Java 13. - * @see #MAJOR_13 - * */ - public static final short MINOR_13 = 0; - - /** Major version number of class files for Java 14. - * @see #MINOR_14 - * @since 6.4.0 - * */ - public static final short MAJOR_14 = 58; - - /** Minor version number of class files for Java 14. - * @see #MAJOR_14 - * @since 6.4.0 - * */ - public static final short MINOR_14 = 0; - - /** Default major version number. Class file is for Java 1.1. - * @see #MAJOR_1_1 - * */ - public static final short MAJOR = MAJOR_1_1; - - /** Default major version number. Class file is for Java 1.1. - * @see #MAJOR_1_1 - * */ - public static final short MINOR = MINOR_1_1; - - /** Maximum value for an unsigned short. - */ - public static final int MAX_SHORT = 65535; // 2^16 - 1 - - /** Maximum value for an unsigned byte. - */ - public static final int MAX_BYTE = 255; // 2^8 - 1 - - /** One of the access flags for fields, methods, or classes. - * - * @see - * Flag definitions for Classes in the Java Virtual Machine Specification (Java SE 9 Edition). - * @see - * Flag definitions for Fields in the Java Virtual Machine Specification (Java SE 9 Edition). - * @see - * Flag definitions for Methods in the Java Virtual Machine Specification (Java SE 9 Edition). - * @see - * Flag definitions for Inner Classes in the Java Virtual Machine Specification (Java SE 9 Edition). - */ - public static final short ACC_PUBLIC = 0x0001; - - /** One of the access flags for fields, methods, or classes. - * @see #ACC_PUBLIC - */ - public static final short ACC_PRIVATE = 0x0002; - - /** One of the access flags for fields, methods, or classes. - * @see #ACC_PUBLIC - */ - public static final short ACC_PROTECTED = 0x0004; - - /** One of the access flags for fields, methods, or classes. - * @see #ACC_PUBLIC - */ - public static final short ACC_STATIC = 0x0008; - - /** One of the access flags for fields, methods, or classes. - * @see #ACC_PUBLIC - */ - public static final short ACC_FINAL = 0x0010; - - /** One of the access flags for the Module attribute. - * @see #ACC_PUBLIC - */ - public static final short ACC_OPEN = 0x0020; - - /** One of the access flags for classes. - * @see #ACC_PUBLIC - */ - public static final short ACC_SUPER = 0x0020; - - /** One of the access flags for methods. - * @see #ACC_PUBLIC - */ - public static final short ACC_SYNCHRONIZED = 0x0020; - - /** One of the access flags for the Module attribute. - * @see #ACC_PUBLIC - */ - public static final short ACC_TRANSITIVE = 0x0020; - - /** One of the access flags for methods. - * @see #ACC_PUBLIC - */ - public static final short ACC_BRIDGE = 0x0040; - - /** One of the access flags for the Module attribute. - * @see #ACC_PUBLIC - */ - public static final short ACC_STATIC_PHASE = 0x0040; - - /** One of the access flags for fields. - * @see #ACC_PUBLIC - */ - public static final short ACC_VOLATILE = 0x0040; - - /** One of the access flags for fields. - * @see #ACC_PUBLIC - */ - public static final short ACC_TRANSIENT = 0x0080; - - /** One of the access flags for methods. - * @see #ACC_PUBLIC - */ - public static final short ACC_VARARGS = 0x0080; - - /** One of the access flags for methods. - * @see #ACC_PUBLIC - */ - public static final short ACC_NATIVE = 0x0100; - - /** One of the access flags for classes. - * @see #ACC_PUBLIC - */ - public static final short ACC_INTERFACE = 0x0200; - - /** One of the access flags for methods or classes. - * @see #ACC_PUBLIC - */ - public static final short ACC_ABSTRACT = 0x0400; - - /** One of the access flags for methods. - * @see #ACC_PUBLIC - */ - public static final short ACC_STRICT = 0x0800; - - /** One of the access flags for fields, methods, classes, MethodParameter attribute, or Module attribute. - * @see #ACC_PUBLIC - */ - public static final short ACC_SYNTHETIC = 0x1000; - - /** One of the access flags for classes. - * @see #ACC_PUBLIC - */ - public static final short ACC_ANNOTATION = 0x2000; - - /** One of the access flags for fields or classes. - * @see #ACC_PUBLIC - */ - public static final short ACC_ENUM = 0x4000; - - // Applies to classes compiled by new compilers only - /** One of the access flags for MethodParameter or Module attributes. - * @see #ACC_PUBLIC - */ - public static final short ACC_MANDATED = (short) 0x8000; - - /** One of the access flags for classes. - * @see #ACC_PUBLIC - */ - public static final short ACC_MODULE = (short) 0x8000; - - /** One of the access flags for fields, methods, or classes. - * @see #ACC_PUBLIC - * @deprecated Use {@link #MAX_ACC_FLAG_I} - */ - @Deprecated - public static final short MAX_ACC_FLAG = ACC_ENUM; - - /** One of the access flags for fields, methods, or classes. - * ACC_MODULE is negative as a short. - * @see #ACC_PUBLIC - * @since 6.4.0 - */ - public static final int MAX_ACC_FLAG_I = 0x8000; // ACC_MODULE is negative as a short - - // Note that do to overloading: - // 'synchronized' is for methods, might be 'open' (if Module), 'super' (if class), or 'transitive' (if Module). - // 'volatile' is for fields, might be 'bridge' (if method) or 'static_phase' (if Module) - // 'transient' is for fields, might be 'varargs' (if method) - // 'module' is for classes, might be 'mandated' (if Module or MethodParameters) - /** - * The names of the access flags. - */ - private static final String[] ACCESS_NAMES = { - "public", "private", "protected", "static", "final", "synchronized", - "volatile", "transient", "native", "interface", "abstract", "strictfp", - "synthetic", "annotation", "enum", "module" - }; - - /** @since 6.0 */ - public static final int ACCESS_NAMES_LENGTH = ACCESS_NAMES.length; - - /** - * @param index - * @return the ACCESS_NAMES entry at the given index - * @since 6.0 - */ - public static String getAccessName(final int index) { - return ACCESS_NAMES[index]; - } - - /* - * The description of the constant pool is at: - * http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4 - * References below are to the individual sections - */ - - /** - * Marks a constant pool entry as type UTF-8. - * @see - * The Constant Pool in The Java Virtual Machine Specification - */ - public static final byte CONSTANT_Utf8 = 1; - - /** - * Marks a constant pool entry as type Integer. - * @see - * The Constant Pool in The Java Virtual Machine Specification - */ - public static final byte CONSTANT_Integer = 3; - - /** - * Marks a constant pool entry as type Float. - * @see - * The Constant Pool in The Java Virtual Machine Specification - */ - public static final byte CONSTANT_Float = 4; - - /** - * Marks a constant pool entry as type Long. - * @see - * The Constant Pool in The Java Virtual Machine Specification - */ - public static final byte CONSTANT_Long = 5; - - /** - * Marks a constant pool entry as type Double. - * @see - * The Constant Pool in The Java Virtual Machine Specification - */ - public static final byte CONSTANT_Double = 6; - - /** - * Marks a constant pool entry as a Class - * @see - * The Constant Pool in The Java Virtual Machine Specification - */ - public static final byte CONSTANT_Class = 7; - - /** - * Marks a constant pool entry as a Field Reference. - * @see - * The Constant Pool in The Java Virtual Machine Specification - */ - public static final byte CONSTANT_Fieldref = 9; - - /** - * Marks a constant pool entry as type String - * @see - * The Constant Pool in The Java Virtual Machine Specification - */ - public static final byte CONSTANT_String = 8; - - /** Marks a constant pool entry as a Method Reference. - * @see - * The Constant Pool in The Java Virtual Machine Specification */ - public static final byte CONSTANT_Methodref = 10; - - /** - * Marks a constant pool entry as an Interface Method Reference. - * @see - * The Constant Pool in The Java Virtual Machine Specification - */ - public static final byte CONSTANT_InterfaceMethodref = 11; - - /** Marks a constant pool entry as a name and type. - * @see - * The Constant Pool in The Java Virtual Machine Specification */ - public static final byte CONSTANT_NameAndType = 12; - - /** - * Marks a constant pool entry as a Method Handle. - * @see - * The Constant Pool in The Java Virtual Machine Specification - */ - public static final byte CONSTANT_MethodHandle = 15; - - /** - * Marks a constant pool entry as a Method Type. - * @see - * The Constant Pool in The Java Virtual Machine Specification - */ - public static final byte CONSTANT_MethodType = 16; - - /** - * Marks a constant pool entry as dynamically computed. - * @see - * Change request for JEP 309 - * @since 6.3 - */ - public static final byte CONSTANT_Dynamic = 17; - - /** - * Marks a constant pool entry as an Invoke Dynamic - * @see - * The Constant Pool in The Java Virtual Machine Specification - */ - public static final byte CONSTANT_InvokeDynamic = 18; - - /** - * Marks a constant pool entry as a Module Reference. - * @see - * The Constant Pool in The Java Virtual Machine Specification - * @since 6.1 - */ - public static final byte CONSTANT_Module = 19; - - /** - * Marks a constant pool entry as a Package Reference. - * @see - * The Constant Pool in The Java Virtual Machine Specification - * @since 6.1 - */ - public static final byte CONSTANT_Package = 20; - - /** - * The names of the types of entries in a constant pool. - * Use getConstantName instead - */ - private static final String[] CONSTANT_NAMES = { - "", "CONSTANT_Utf8", "", "CONSTANT_Integer", - "CONSTANT_Float", "CONSTANT_Long", "CONSTANT_Double", - "CONSTANT_Class", "CONSTANT_String", "CONSTANT_Fieldref", - "CONSTANT_Methodref", "CONSTANT_InterfaceMethodref", - "CONSTANT_NameAndType", "", "", "CONSTANT_MethodHandle", - "CONSTANT_MethodType", "CONSTANT_Dynamic", "CONSTANT_InvokeDynamic", - "CONSTANT_Module", "CONSTANT_Package"}; - - /** - * - * @param index - * @return the CONSTANT_NAMES entry at the given index - * @since 6.0 - */ - public static String getConstantName(final int index) { - return CONSTANT_NAMES[index]; - } - - /** The name of the static initializer, also called "class - * initialization method" or "interface initialization - * method". This is "<clinit>". - */ - public static final String STATIC_INITIALIZER_NAME = ""; - - /** The name of every constructor method in a class, also called - * "instance initialization method". This is "<init>". - */ - public static final String CONSTRUCTOR_NAME = ""; - - /** - * The names of the interfaces implemented by arrays - */ - private static final String[] INTERFACES_IMPLEMENTED_BY_ARRAYS = {"java.lang.Cloneable", "java.io.Serializable"}; - - /** - * @since 6.0 - */ - public static Iterable getInterfacesImplementedByArrays() { - return Collections.unmodifiableList(Arrays.asList(INTERFACES_IMPLEMENTED_BY_ARRAYS)); - } - - /** - * Maximum Constant Pool entries. - * One of the limitations of the Java Virtual Machine. - * @see - * The Java Virtual Machine Specification, Java SE 8 Edition, page 330, chapter 4.11. - */ - public static final int MAX_CP_ENTRIES = 65535; - - /** - * Maximum code size (plus one; the code size must be LESS than this) - * One of the limitations of the Java Virtual Machine. - * Note vmspec2 page 152 ("Limitations") says: - * "The amount of code per non-native, non-abstract method is limited to 65536 bytes by - * the sizes of the indices in the exception_table of the Code attribute (§4.7.3), - * in the LineNumberTable attribute (§4.7.8), and in the LocalVariableTable attribute (§4.7.9)." - * However this should be taken as an upper limit rather than the defined maximum. - * On page 134 (4.8.1 Static Constants) of the same spec, it says: - * "The value of the code_length item must be less than 65536." - * The entry in the Limitations section has been removed from later versions of the spec; - * it is not present in the Java SE 8 edition. - * - * @see - * The Java Virtual Machine Specification, Java SE 8 Edition, page 104, chapter 4.7. - */ - public static final int MAX_CODE_SIZE = 65536; //bytes - - /** - * The maximum number of dimensions in an array ({@value}). - * One of the limitations of the Java Virtual Machine. - * - * @see - * Field Descriptors in The Java Virtual Machine Specification - */ - public static final int MAX_ARRAY_DIMENSIONS = 255; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short NOP = 0; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short ACONST_NULL = 1; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short ICONST_M1 = 2; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short ICONST_0 = 3; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short ICONST_1 = 4; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short ICONST_2 = 5; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short ICONST_3 = 6; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short ICONST_4 = 7; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short ICONST_5 = 8; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short LCONST_0 = 9; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short LCONST_1 = 10; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short FCONST_0 = 11; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short FCONST_1 = 12; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short FCONST_2 = 13; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short DCONST_0 = 14; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short DCONST_1 = 15; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short BIPUSH = 16; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short SIPUSH = 17; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short LDC = 18; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short LDC_W = 19; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short LDC2_W = 20; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short ILOAD = 21; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short LLOAD = 22; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short FLOAD = 23; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short DLOAD = 24; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short ALOAD = 25; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short ILOAD_0 = 26; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short ILOAD_1 = 27; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short ILOAD_2 = 28; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short ILOAD_3 = 29; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short LLOAD_0 = 30; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short LLOAD_1 = 31; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short LLOAD_2 = 32; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short LLOAD_3 = 33; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short FLOAD_0 = 34; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short FLOAD_1 = 35; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short FLOAD_2 = 36; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short FLOAD_3 = 37; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short DLOAD_0 = 38; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short DLOAD_1 = 39; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short DLOAD_2 = 40; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short DLOAD_3 = 41; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short ALOAD_0 = 42; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short ALOAD_1 = 43; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short ALOAD_2 = 44; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short ALOAD_3 = 45; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short IALOAD = 46; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short LALOAD = 47; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short FALOAD = 48; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short DALOAD = 49; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short AALOAD = 50; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short BALOAD = 51; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short CALOAD = 52; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short SALOAD = 53; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short ISTORE = 54; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short LSTORE = 55; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short FSTORE = 56; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short DSTORE = 57; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short ASTORE = 58; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short ISTORE_0 = 59; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short ISTORE_1 = 60; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short ISTORE_2 = 61; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short ISTORE_3 = 62; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short LSTORE_0 = 63; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short LSTORE_1 = 64; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short LSTORE_2 = 65; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short LSTORE_3 = 66; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short FSTORE_0 = 67; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short FSTORE_1 = 68; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short FSTORE_2 = 69; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short FSTORE_3 = 70; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short DSTORE_0 = 71; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short DSTORE_1 = 72; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short DSTORE_2 = 73; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short DSTORE_3 = 74; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short ASTORE_0 = 75; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short ASTORE_1 = 76; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short ASTORE_2 = 77; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short ASTORE_3 = 78; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short IASTORE = 79; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short LASTORE = 80; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short FASTORE = 81; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short DASTORE = 82; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short AASTORE = 83; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short BASTORE = 84; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short CASTORE = 85; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short SASTORE = 86; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short POP = 87; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short POP2 = 88; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short DUP = 89; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short DUP_X1 = 90; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short DUP_X2 = 91; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short DUP2 = 92; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short DUP2_X1 = 93; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short DUP2_X2 = 94; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short SWAP = 95; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short IADD = 96; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short LADD = 97; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short FADD = 98; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short DADD = 99; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short ISUB = 100; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short LSUB = 101; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short FSUB = 102; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short DSUB = 103; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short IMUL = 104; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short LMUL = 105; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short FMUL = 106; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short DMUL = 107; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short IDIV = 108; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short LDIV = 109; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short FDIV = 110; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short DDIV = 111; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short IREM = 112; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short LREM = 113; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short FREM = 114; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short DREM = 115; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short INEG = 116; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short LNEG = 117; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short FNEG = 118; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short DNEG = 119; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short ISHL = 120; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short LSHL = 121; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short ISHR = 122; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short LSHR = 123; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short IUSHR = 124; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short LUSHR = 125; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short IAND = 126; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short LAND = 127; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short IOR = 128; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short LOR = 129; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short IXOR = 130; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short LXOR = 131; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short IINC = 132; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short I2L = 133; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short I2F = 134; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short I2D = 135; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short L2I = 136; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short L2F = 137; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short L2D = 138; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short F2I = 139; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short F2L = 140; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short F2D = 141; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short D2I = 142; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short D2L = 143; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short D2F = 144; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short I2B = 145; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short INT2BYTE = 145; // Old notation - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short I2C = 146; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short INT2CHAR = 146; // Old notation - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short I2S = 147; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short INT2SHORT = 147; // Old notation - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short LCMP = 148; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short FCMPL = 149; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short FCMPG = 150; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short DCMPL = 151; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short DCMPG = 152; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short IFEQ = 153; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short IFNE = 154; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short IFLT = 155; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short IFGE = 156; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short IFGT = 157; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short IFLE = 158; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short IF_ICMPEQ = 159; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short IF_ICMPNE = 160; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short IF_ICMPLT = 161; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short IF_ICMPGE = 162; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short IF_ICMPGT = 163; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short IF_ICMPLE = 164; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short IF_ACMPEQ = 165; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short IF_ACMPNE = 166; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short GOTO = 167; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short JSR = 168; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short RET = 169; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short TABLESWITCH = 170; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short LOOKUPSWITCH = 171; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short IRETURN = 172; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short LRETURN = 173; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short FRETURN = 174; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short DRETURN = 175; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short ARETURN = 176; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short RETURN = 177; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short GETSTATIC = 178; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short PUTSTATIC = 179; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short GETFIELD = 180; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short PUTFIELD = 181; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short INVOKEVIRTUAL = 182; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short INVOKESPECIAL = 183; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short INVOKENONVIRTUAL = 183; // Old name in JDK 1.0 - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short INVOKESTATIC = 184; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short INVOKEINTERFACE = 185; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short INVOKEDYNAMIC = 186; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short NEW = 187; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short NEWARRAY = 188; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short ANEWARRAY = 189; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short ARRAYLENGTH = 190; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short ATHROW = 191; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short CHECKCAST = 192; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short INSTANCEOF = 193; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short MONITORENTER = 194; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short MONITOREXIT = 195; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short WIDE = 196; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short MULTIANEWARRAY = 197; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short IFNULL = 198; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short IFNONNULL = 199; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short GOTO_W = 200; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - public static final short JSR_W = 201; - - /** JVM internal opcode. - * @see - * Reserved opcodes in the Java Virtual Machine Specification */ - public static final short BREAKPOINT = 202; - - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - public static final short LDC_QUICK = 203; - - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - public static final short LDC_W_QUICK = 204; - - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - public static final short LDC2_W_QUICK = 205; - - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - public static final short GETFIELD_QUICK = 206; - - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - public static final short PUTFIELD_QUICK = 207; - - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - public static final short GETFIELD2_QUICK = 208; - - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - public static final short PUTFIELD2_QUICK = 209; - - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - public static final short GETSTATIC_QUICK = 210; - - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - public static final short PUTSTATIC_QUICK = 211; - - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - public static final short GETSTATIC2_QUICK = 212; - - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - public static final short PUTSTATIC2_QUICK = 213; - - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - public static final short INVOKEVIRTUAL_QUICK = 214; - - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - public static final short INVOKENONVIRTUAL_QUICK = 215; - - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - public static final short INVOKESUPER_QUICK = 216; - - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - public static final short INVOKESTATIC_QUICK = 217; - - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - public static final short INVOKEINTERFACE_QUICK = 218; - - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - public static final short INVOKEVIRTUALOBJECT_QUICK = 219; - - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - public static final short NEW_QUICK = 221; - - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - public static final short ANEWARRAY_QUICK = 222; - - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - public static final short MULTIANEWARRAY_QUICK = 223; - - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - public static final short CHECKCAST_QUICK = 224; - - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - public static final short INSTANCEOF_QUICK = 225; - - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - public static final short INVOKEVIRTUAL_QUICK_W = 226; - - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - public static final short GETFIELD_QUICK_W = 227; - - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - public static final short PUTFIELD_QUICK_W = 228; - - /** JVM internal opcode. - * @see - * Reserved opcodes in the Java Virtual Machine Specification */ - public static final short IMPDEP1 = 254; - - /** JVM internal opcode. - * @see - * Reserved opcodes in the Java Virtual Machine Specification */ - public static final short IMPDEP2 = 255; - - /** - * BCEL virtual instruction for pushing an arbitrary data type onto the stack. Will be converted to the appropriate JVM - * opcode when the class is dumped. - */ - public static final short PUSH = 4711; - - /** - * BCEL virtual instruction for either LOOKUPSWITCH or TABLESWITCH. Will be converted to the appropriate JVM - * opcode when the class is dumped. - */ - public static final short SWITCH = 4712; - - /** Illegal opcode. */ - public static final short UNDEFINED = -1; - - /** Illegal opcode. */ - public static final short UNPREDICTABLE = -2; - - /** Illegal opcode. */ - public static final short RESERVED = -3; - - /** Mnemonic for an illegal opcode. */ - public static final String ILLEGAL_OPCODE = ""; - - /** Mnemonic for an illegal type. */ - public static final String ILLEGAL_TYPE = ""; - - /** Boolean data type. - * @see - * Static Constraints in the Java Virtual Machine Specification */ - public static final byte T_BOOLEAN = 4; - - /** Char data type. - * @see - * Static Constraints in the Java Virtual Machine Specification */ - public static final byte T_CHAR = 5; - - /** Float data type. - * @see - * Static Constraints in the Java Virtual Machine Specification */ - public static final byte T_FLOAT = 6; - - /** Double data type. - * @see - * Static Constraints in the Java Virtual Machine Specification */ - public static final byte T_DOUBLE = 7; - - /** Byte data type. - * @see - * Static Constraints in the Java Virtual Machine Specification */ - public static final byte T_BYTE = 8; - - /** Short data type. - * @see - * Static Constraints in the Java Virtual Machine Specification */ - public static final byte T_SHORT = 9; - - /** Int data type. - * @see - * Static Constraints in the Java Virtual Machine Specification */ - public static final byte T_INT = 10; - - /** Long data type. - * @see - * Static Constraints in the Java Virtual Machine Specification */ - public static final byte T_LONG = 11; - - /** Void data type (non-standard). */ - public static final byte T_VOID = 12; // Non-standard - - /** Array data type. */ - public static final byte T_ARRAY = 13; - - /** Object data type. */ - public static final byte T_OBJECT = 14; - - /** Reference data type (deprecated). */ - public static final byte T_REFERENCE = 14; // Deprecated - - /** Unknown data type. */ - public static final byte T_UNKNOWN = 15; - - /** Address data type. */ - public static final byte T_ADDRESS = 16; - - /** The primitive type names corresponding to the T_XX constants, - * e.g., TYPE_NAMES[T_INT] = "int" - */ - private static final String[] TYPE_NAMES = { - ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE, - "boolean", "char", "float", "double", "byte", "short", "int", "long", - "void", "array", "object", "unknown", "address" - }; - - /** - * The primitive type names corresponding to the T_XX constants, - * e.g., TYPE_NAMES[T_INT] = "int" - * @param index - * @return the type name - * @since 6.0 - */ - public static String getTypeName(final int index) { - return TYPE_NAMES[index]; - } - - /** The primitive class names corresponding to the T_XX constants, - * e.g., CLASS_TYPE_NAMES[T_INT] = "java.lang.Integer" - */ - private static final String[] CLASS_TYPE_NAMES = { - ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE, - "java.lang.Boolean", "java.lang.Character", "java.lang.Float", - "java.lang.Double", "java.lang.Byte", "java.lang.Short", - "java.lang.Integer", "java.lang.Long", "java.lang.Void", - ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE - }; - - /** - * The primitive class names corresponding to the T_XX constants, - * e.g., CLASS_TYPE_NAMES[T_INT] = "java.lang.Integer" - * @param index - * @return the class name - * @since 6.0 - */ - public static String getClassTypeName(final int index) { - return CLASS_TYPE_NAMES[index]; - } - - /** The signature characters corresponding to primitive types, - * e.g., SHORT_TYPE_NAMES[T_INT] = "I" - */ - private static final String[] SHORT_TYPE_NAMES = { - ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE, - "Z", "C", "F", "D", "B", "S", "I", "J", - "V", ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE - }; - - /** - * - * @param index - * @return the short type name - * @since 6.0 - */ - public static String getShortTypeName(final int index) { - return SHORT_TYPE_NAMES[index]; - } - - - /** - * Number of byte code operands for each opcode, i.e., number of bytes after the tag byte - * itself. Indexed by opcode, so NO_OF_OPERANDS[BIPUSH] = the number of operands for a bipush - * instruction. - */ - private static final short[] NO_OF_OPERANDS = { - 0/*nop*/, 0/*aconst_null*/, 0/*iconst_m1*/, 0/*iconst_0*/, - 0/*iconst_1*/, 0/*iconst_2*/, 0/*iconst_3*/, 0/*iconst_4*/, - 0/*iconst_5*/, 0/*lconst_0*/, 0/*lconst_1*/, 0/*fconst_0*/, - 0/*fconst_1*/, 0/*fconst_2*/, 0/*dconst_0*/, 0/*dconst_1*/, - 1/*bipush*/, 2/*sipush*/, 1/*ldc*/, 2/*ldc_w*/, 2/*ldc2_w*/, - 1/*iload*/, 1/*lload*/, 1/*fload*/, 1/*dload*/, 1/*aload*/, - 0/*iload_0*/, 0/*iload_1*/, 0/*iload_2*/, 0/*iload_3*/, - 0/*lload_0*/, 0/*lload_1*/, 0/*lload_2*/, 0/*lload_3*/, - 0/*fload_0*/, 0/*fload_1*/, 0/*fload_2*/, 0/*fload_3*/, - 0/*dload_0*/, 0/*dload_1*/, 0/*dload_2*/, 0/*dload_3*/, - 0/*aload_0*/, 0/*aload_1*/, 0/*aload_2*/, 0/*aload_3*/, - 0/*iaload*/, 0/*laload*/, 0/*faload*/, 0/*daload*/, - 0/*aaload*/, 0/*baload*/, 0/*caload*/, 0/*saload*/, - 1/*istore*/, 1/*lstore*/, 1/*fstore*/, 1/*dstore*/, - 1/*astore*/, 0/*istore_0*/, 0/*istore_1*/, 0/*istore_2*/, - 0/*istore_3*/, 0/*lstore_0*/, 0/*lstore_1*/, 0/*lstore_2*/, - 0/*lstore_3*/, 0/*fstore_0*/, 0/*fstore_1*/, 0/*fstore_2*/, - 0/*fstore_3*/, 0/*dstore_0*/, 0/*dstore_1*/, 0/*dstore_2*/, - 0/*dstore_3*/, 0/*astore_0*/, 0/*astore_1*/, 0/*astore_2*/, - 0/*astore_3*/, 0/*iastore*/, 0/*lastore*/, 0/*fastore*/, - 0/*dastore*/, 0/*aastore*/, 0/*bastore*/, 0/*castore*/, - 0/*sastore*/, 0/*pop*/, 0/*pop2*/, 0/*dup*/, 0/*dup_x1*/, - 0/*dup_x2*/, 0/*dup2*/, 0/*dup2_x1*/, 0/*dup2_x2*/, 0/*swap*/, - 0/*iadd*/, 0/*ladd*/, 0/*fadd*/, 0/*dadd*/, 0/*isub*/, - 0/*lsub*/, 0/*fsub*/, 0/*dsub*/, 0/*imul*/, 0/*lmul*/, - 0/*fmul*/, 0/*dmul*/, 0/*idiv*/, 0/*ldiv*/, 0/*fdiv*/, - 0/*ddiv*/, 0/*irem*/, 0/*lrem*/, 0/*frem*/, 0/*drem*/, - 0/*ineg*/, 0/*lneg*/, 0/*fneg*/, 0/*dneg*/, 0/*ishl*/, - 0/*lshl*/, 0/*ishr*/, 0/*lshr*/, 0/*iushr*/, 0/*lushr*/, - 0/*iand*/, 0/*land*/, 0/*ior*/, 0/*lor*/, 0/*ixor*/, 0/*lxor*/, - 2/*iinc*/, 0/*i2l*/, 0/*i2f*/, 0/*i2d*/, 0/*l2i*/, 0/*l2f*/, - 0/*l2d*/, 0/*f2i*/, 0/*f2l*/, 0/*f2d*/, 0/*d2i*/, 0/*d2l*/, - 0/*d2f*/, 0/*i2b*/, 0/*i2c*/, 0/*i2s*/, 0/*lcmp*/, 0/*fcmpl*/, - 0/*fcmpg*/, 0/*dcmpl*/, 0/*dcmpg*/, 2/*ifeq*/, 2/*ifne*/, - 2/*iflt*/, 2/*ifge*/, 2/*ifgt*/, 2/*ifle*/, 2/*if_icmpeq*/, - 2/*if_icmpne*/, 2/*if_icmplt*/, 2/*if_icmpge*/, 2/*if_icmpgt*/, - 2/*if_icmple*/, 2/*if_acmpeq*/, 2/*if_acmpne*/, 2/*goto*/, - 2/*jsr*/, 1/*ret*/, UNPREDICTABLE/*tableswitch*/, UNPREDICTABLE/*lookupswitch*/, - 0/*ireturn*/, 0/*lreturn*/, 0/*freturn*/, - 0/*dreturn*/, 0/*areturn*/, 0/*return*/, - 2/*getstatic*/, 2/*putstatic*/, 2/*getfield*/, - 2/*putfield*/, 2/*invokevirtual*/, 2/*invokespecial*/, 2/*invokestatic*/, - 4/*invokeinterface*/, 4/*invokedynamic*/, 2/*new*/, - 1/*newarray*/, 2/*anewarray*/, - 0/*arraylength*/, 0/*athrow*/, 2/*checkcast*/, - 2/*instanceof*/, 0/*monitorenter*/, - 0/*monitorexit*/, UNPREDICTABLE/*wide*/, 3/*multianewarray*/, - 2/*ifnull*/, 2/*ifnonnull*/, 4/*goto_w*/, - 4/*jsr_w*/, 0/*breakpoint*/, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, RESERVED/*impdep1*/, RESERVED/*impdep2*/ - }; - - /** - * - * @param index - * @return Number of byte code operands - * @since 6.0 - */ - public static short getNoOfOperands(final int index) { - return NO_OF_OPERANDS[index]; - } - - /** - * How the byte code operands are to be interpreted for each opcode. - * Indexed by opcode. TYPE_OF_OPERANDS[ILOAD] = an array of shorts - * describing the data types for the instruction. - */ - private static final short[][] TYPE_OF_OPERANDS = { - {}/*nop*/, {}/*aconst_null*/, {}/*iconst_m1*/, {}/*iconst_0*/, - {}/*iconst_1*/, {}/*iconst_2*/, {}/*iconst_3*/, {}/*iconst_4*/, - {}/*iconst_5*/, {}/*lconst_0*/, {}/*lconst_1*/, {}/*fconst_0*/, - {}/*fconst_1*/, {}/*fconst_2*/, {}/*dconst_0*/, {}/*dconst_1*/, - {T_BYTE}/*bipush*/, {T_SHORT}/*sipush*/, {T_BYTE}/*ldc*/, - {T_SHORT}/*ldc_w*/, {T_SHORT}/*ldc2_w*/, - {T_BYTE}/*iload*/, {T_BYTE}/*lload*/, {T_BYTE}/*fload*/, - {T_BYTE}/*dload*/, {T_BYTE}/*aload*/, {}/*iload_0*/, - {}/*iload_1*/, {}/*iload_2*/, {}/*iload_3*/, {}/*lload_0*/, - {}/*lload_1*/, {}/*lload_2*/, {}/*lload_3*/, {}/*fload_0*/, - {}/*fload_1*/, {}/*fload_2*/, {}/*fload_3*/, {}/*dload_0*/, - {}/*dload_1*/, {}/*dload_2*/, {}/*dload_3*/, {}/*aload_0*/, - {}/*aload_1*/, {}/*aload_2*/, {}/*aload_3*/, {}/*iaload*/, - {}/*laload*/, {}/*faload*/, {}/*daload*/, {}/*aaload*/, - {}/*baload*/, {}/*caload*/, {}/*saload*/, {T_BYTE}/*istore*/, - {T_BYTE}/*lstore*/, {T_BYTE}/*fstore*/, {T_BYTE}/*dstore*/, - {T_BYTE}/*astore*/, {}/*istore_0*/, {}/*istore_1*/, - {}/*istore_2*/, {}/*istore_3*/, {}/*lstore_0*/, {}/*lstore_1*/, - {}/*lstore_2*/, {}/*lstore_3*/, {}/*fstore_0*/, {}/*fstore_1*/, - {}/*fstore_2*/, {}/*fstore_3*/, {}/*dstore_0*/, {}/*dstore_1*/, - {}/*dstore_2*/, {}/*dstore_3*/, {}/*astore_0*/, {}/*astore_1*/, - {}/*astore_2*/, {}/*astore_3*/, {}/*iastore*/, {}/*lastore*/, - {}/*fastore*/, {}/*dastore*/, {}/*aastore*/, {}/*bastore*/, - {}/*castore*/, {}/*sastore*/, {}/*pop*/, {}/*pop2*/, {}/*dup*/, - {}/*dup_x1*/, {}/*dup_x2*/, {}/*dup2*/, {}/*dup2_x1*/, - {}/*dup2_x2*/, {}/*swap*/, {}/*iadd*/, {}/*ladd*/, {}/*fadd*/, - {}/*dadd*/, {}/*isub*/, {}/*lsub*/, {}/*fsub*/, {}/*dsub*/, - {}/*imul*/, {}/*lmul*/, {}/*fmul*/, {}/*dmul*/, {}/*idiv*/, - {}/*ldiv*/, {}/*fdiv*/, {}/*ddiv*/, {}/*irem*/, {}/*lrem*/, - {}/*frem*/, {}/*drem*/, {}/*ineg*/, {}/*lneg*/, {}/*fneg*/, - {}/*dneg*/, {}/*ishl*/, {}/*lshl*/, {}/*ishr*/, {}/*lshr*/, - {}/*iushr*/, {}/*lushr*/, {}/*iand*/, {}/*land*/, {}/*ior*/, - {}/*lor*/, {}/*ixor*/, {}/*lxor*/, {T_BYTE, T_BYTE}/*iinc*/, - {}/*i2l*/, {}/*i2f*/, {}/*i2d*/, {}/*l2i*/, {}/*l2f*/, {}/*l2d*/, - {}/*f2i*/, {}/*f2l*/, {}/*f2d*/, {}/*d2i*/, {}/*d2l*/, {}/*d2f*/, - {}/*i2b*/, {}/*i2c*/, {}/*i2s*/, {}/*lcmp*/, {}/*fcmpl*/, - {}/*fcmpg*/, {}/*dcmpl*/, {}/*dcmpg*/, {T_SHORT}/*ifeq*/, - {T_SHORT}/*ifne*/, {T_SHORT}/*iflt*/, {T_SHORT}/*ifge*/, - {T_SHORT}/*ifgt*/, {T_SHORT}/*ifle*/, {T_SHORT}/*if_icmpeq*/, - {T_SHORT}/*if_icmpne*/, {T_SHORT}/*if_icmplt*/, - {T_SHORT}/*if_icmpge*/, {T_SHORT}/*if_icmpgt*/, - {T_SHORT}/*if_icmple*/, {T_SHORT}/*if_acmpeq*/, - {T_SHORT}/*if_acmpne*/, {T_SHORT}/*goto*/, {T_SHORT}/*jsr*/, - {T_BYTE}/*ret*/, {}/*tableswitch*/, {}/*lookupswitch*/, - {}/*ireturn*/, {}/*lreturn*/, {}/*freturn*/, {}/*dreturn*/, - {}/*areturn*/, {}/*return*/, {T_SHORT}/*getstatic*/, - {T_SHORT}/*putstatic*/, {T_SHORT}/*getfield*/, - {T_SHORT}/*putfield*/, {T_SHORT}/*invokevirtual*/, - {T_SHORT}/*invokespecial*/, {T_SHORT}/*invokestatic*/, - {T_SHORT, T_BYTE, T_BYTE}/*invokeinterface*/, {T_SHORT, T_BYTE, T_BYTE}/*invokedynamic*/, - {T_SHORT}/*new*/, {T_BYTE}/*newarray*/, - {T_SHORT}/*anewarray*/, {}/*arraylength*/, {}/*athrow*/, - {T_SHORT}/*checkcast*/, {T_SHORT}/*instanceof*/, - {}/*monitorenter*/, {}/*monitorexit*/, {T_BYTE}/*wide*/, - {T_SHORT, T_BYTE}/*multianewarray*/, {T_SHORT}/*ifnull*/, - {T_SHORT}/*ifnonnull*/, {T_INT}/*goto_w*/, {T_INT}/*jsr_w*/, - {}/*breakpoint*/, {}, {}, {}, {}, {}, {}, {}, - {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, - {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, - {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, - {}/*impdep1*/, {}/*impdep2*/ - }; - - /** - * @since 6.0 - */ - public static short getOperandType(final int opcode, final int index) { - return TYPE_OF_OPERANDS[opcode][index]; - } - - /** - * @since 6.0 - */ - public static long getOperandTypeCount(final int opcode) { - return TYPE_OF_OPERANDS[opcode].length; - } - - /** - * Names of opcodes. Indexed by opcode. OPCODE_NAMES[ALOAD] = "aload". - */ - private static final String[] OPCODE_NAMES = { - "nop", "aconst_null", "iconst_m1", "iconst_0", "iconst_1", - "iconst_2", "iconst_3", "iconst_4", "iconst_5", "lconst_0", - "lconst_1", "fconst_0", "fconst_1", "fconst_2", "dconst_0", - "dconst_1", "bipush", "sipush", "ldc", "ldc_w", "ldc2_w", "iload", - "lload", "fload", "dload", "aload", "iload_0", "iload_1", "iload_2", - "iload_3", "lload_0", "lload_1", "lload_2", "lload_3", "fload_0", - "fload_1", "fload_2", "fload_3", "dload_0", "dload_1", "dload_2", - "dload_3", "aload_0", "aload_1", "aload_2", "aload_3", "iaload", - "laload", "faload", "daload", "aaload", "baload", "caload", "saload", - "istore", "lstore", "fstore", "dstore", "astore", "istore_0", - "istore_1", "istore_2", "istore_3", "lstore_0", "lstore_1", - "lstore_2", "lstore_3", "fstore_0", "fstore_1", "fstore_2", - "fstore_3", "dstore_0", "dstore_1", "dstore_2", "dstore_3", - "astore_0", "astore_1", "astore_2", "astore_3", "iastore", "lastore", - "fastore", "dastore", "aastore", "bastore", "castore", "sastore", - "pop", "pop2", "dup", "dup_x1", "dup_x2", "dup2", "dup2_x1", - "dup2_x2", "swap", "iadd", "ladd", "fadd", "dadd", "isub", "lsub", - "fsub", "dsub", "imul", "lmul", "fmul", "dmul", "idiv", "ldiv", - "fdiv", "ddiv", "irem", "lrem", "frem", "drem", "ineg", "lneg", - "fneg", "dneg", "ishl", "lshl", "ishr", "lshr", "iushr", "lushr", - "iand", "land", "ior", "lor", "ixor", "lxor", "iinc", "i2l", "i2f", - "i2d", "l2i", "l2f", "l2d", "f2i", "f2l", "f2d", "d2i", "d2l", "d2f", - "i2b", "i2c", "i2s", "lcmp", "fcmpl", "fcmpg", - "dcmpl", "dcmpg", "ifeq", "ifne", "iflt", "ifge", "ifgt", "ifle", - "if_icmpeq", "if_icmpne", "if_icmplt", "if_icmpge", "if_icmpgt", - "if_icmple", "if_acmpeq", "if_acmpne", "goto", "jsr", "ret", - "tableswitch", "lookupswitch", "ireturn", "lreturn", "freturn", - "dreturn", "areturn", "return", "getstatic", "putstatic", "getfield", - "putfield", "invokevirtual", "invokespecial", "invokestatic", - "invokeinterface", "invokedynamic", "new", "newarray", "anewarray", - "arraylength", "athrow", "checkcast", "instanceof", "monitorenter", - "monitorexit", "wide", "multianewarray", "ifnull", "ifnonnull", - "goto_w", "jsr_w", "breakpoint", ILLEGAL_OPCODE, ILLEGAL_OPCODE, - ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, - ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, - ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, - ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, - ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, - ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, - ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, - ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, - ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, - ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, - ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, - ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, - ILLEGAL_OPCODE, "impdep1", "impdep2" - }; - - /** - * @since 6.0 - */ - public static final int OPCODE_NAMES_LENGTH = OPCODE_NAMES.length; - - - /** - * @since 6.0 - */ - public static String getOpcodeName(final int index) { - return OPCODE_NAMES[index]; - } - - /** - * Number of words consumed on operand stack by instructions. - * Indexed by opcode. CONSUME_STACK[FALOAD] = number of words - * consumed from the stack by a faload instruction. - */ - private static final int[] CONSUME_STACK = { - 0/*nop*/, 0/*aconst_null*/, 0/*iconst_m1*/, 0/*iconst_0*/, 0/*iconst_1*/, - 0/*iconst_2*/, 0/*iconst_3*/, 0/*iconst_4*/, 0/*iconst_5*/, 0/*lconst_0*/, - 0/*lconst_1*/, 0/*fconst_0*/, 0/*fconst_1*/, 0/*fconst_2*/, 0/*dconst_0*/, - 0/*dconst_1*/, 0/*bipush*/, 0/*sipush*/, 0/*ldc*/, 0/*ldc_w*/, 0/*ldc2_w*/, 0/*iload*/, - 0/*lload*/, 0/*fload*/, 0/*dload*/, 0/*aload*/, 0/*iload_0*/, 0/*iload_1*/, 0/*iload_2*/, - 0/*iload_3*/, 0/*lload_0*/, 0/*lload_1*/, 0/*lload_2*/, 0/*lload_3*/, 0/*fload_0*/, - 0/*fload_1*/, 0/*fload_2*/, 0/*fload_3*/, 0/*dload_0*/, 0/*dload_1*/, 0/*dload_2*/, - 0/*dload_3*/, 0/*aload_0*/, 0/*aload_1*/, 0/*aload_2*/, 0/*aload_3*/, 2/*iaload*/, - 2/*laload*/, 2/*faload*/, 2/*daload*/, 2/*aaload*/, 2/*baload*/, 2/*caload*/, 2/*saload*/, - 1/*istore*/, 2/*lstore*/, 1/*fstore*/, 2/*dstore*/, 1/*astore*/, 1/*istore_0*/, - 1/*istore_1*/, 1/*istore_2*/, 1/*istore_3*/, 2/*lstore_0*/, 2/*lstore_1*/, - 2/*lstore_2*/, 2/*lstore_3*/, 1/*fstore_0*/, 1/*fstore_1*/, 1/*fstore_2*/, - 1/*fstore_3*/, 2/*dstore_0*/, 2/*dstore_1*/, 2/*dstore_2*/, 2/*dstore_3*/, - 1/*astore_0*/, 1/*astore_1*/, 1/*astore_2*/, 1/*astore_3*/, 3/*iastore*/, 4/*lastore*/, - 3/*fastore*/, 4/*dastore*/, 3/*aastore*/, 3/*bastore*/, 3/*castore*/, 3/*sastore*/, - 1/*pop*/, 2/*pop2*/, 1/*dup*/, 2/*dup_x1*/, 3/*dup_x2*/, 2/*dup2*/, 3/*dup2_x1*/, - 4/*dup2_x2*/, 2/*swap*/, 2/*iadd*/, 4/*ladd*/, 2/*fadd*/, 4/*dadd*/, 2/*isub*/, 4/*lsub*/, - 2/*fsub*/, 4/*dsub*/, 2/*imul*/, 4/*lmul*/, 2/*fmul*/, 4/*dmul*/, 2/*idiv*/, 4/*ldiv*/, - 2/*fdiv*/, 4/*ddiv*/, 2/*irem*/, 4/*lrem*/, 2/*frem*/, 4/*drem*/, 1/*ineg*/, 2/*lneg*/, - 1/*fneg*/, 2/*dneg*/, 2/*ishl*/, 3/*lshl*/, 2/*ishr*/, 3/*lshr*/, 2/*iushr*/, 3/*lushr*/, - 2/*iand*/, 4/*land*/, 2/*ior*/, 4/*lor*/, 2/*ixor*/, 4/*lxor*/, 0/*iinc*/, - 1/*i2l*/, 1/*i2f*/, 1/*i2d*/, 2/*l2i*/, 2/*l2f*/, 2/*l2d*/, 1/*f2i*/, 1/*f2l*/, - 1/*f2d*/, 2/*d2i*/, 2/*d2l*/, 2/*d2f*/, 1/*i2b*/, 1/*i2c*/, 1/*i2s*/, - 4/*lcmp*/, 2/*fcmpl*/, 2/*fcmpg*/, 4/*dcmpl*/, 4/*dcmpg*/, 1/*ifeq*/, 1/*ifne*/, - 1/*iflt*/, 1/*ifge*/, 1/*ifgt*/, 1/*ifle*/, 2/*if_icmpeq*/, 2/*if_icmpne*/, 2/*if_icmplt*/, - 2 /*if_icmpge*/, 2/*if_icmpgt*/, 2/*if_icmple*/, 2/*if_acmpeq*/, 2/*if_acmpne*/, - 0/*goto*/, 0/*jsr*/, 0/*ret*/, 1/*tableswitch*/, 1/*lookupswitch*/, 1/*ireturn*/, - 2/*lreturn*/, 1/*freturn*/, 2/*dreturn*/, 1/*areturn*/, 0/*return*/, 0/*getstatic*/, - UNPREDICTABLE/*putstatic*/, 1/*getfield*/, UNPREDICTABLE/*putfield*/, - UNPREDICTABLE/*invokevirtual*/, UNPREDICTABLE/*invokespecial*/, - UNPREDICTABLE/*invokestatic*/, - UNPREDICTABLE/*invokeinterface*/, UNPREDICTABLE/*invokedynamic*/, 0/*new*/, 1/*newarray*/, 1/*anewarray*/, - 1/*arraylength*/, 1/*athrow*/, 1/*checkcast*/, 1/*instanceof*/, 1/*monitorenter*/, - 1/*monitorexit*/, 0/*wide*/, UNPREDICTABLE/*multianewarray*/, 1/*ifnull*/, 1/*ifnonnull*/, - 0/*goto_w*/, 0/*jsr_w*/, 0/*breakpoint*/, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNPREDICTABLE/*impdep1*/, UNPREDICTABLE/*impdep2*/ - }; - - /** - * - * @param index - * @return Number of words consumed on operand stack - * @since 6.0 - */ - public static int getConsumeStack(final int index) { - return CONSUME_STACK[index]; - } - - - /** - * Number of words produced onto operand stack by instructions. - * Indexed by opcode. CONSUME_STACK[DALOAD] = number of words - * consumed from the stack by a daload instruction. - */ - private static final int[] PRODUCE_STACK = { - 0/*nop*/, 1/*aconst_null*/, 1/*iconst_m1*/, 1/*iconst_0*/, 1/*iconst_1*/, - 1/*iconst_2*/, 1/*iconst_3*/, 1/*iconst_4*/, 1/*iconst_5*/, 2/*lconst_0*/, - 2/*lconst_1*/, 1/*fconst_0*/, 1/*fconst_1*/, 1/*fconst_2*/, 2/*dconst_0*/, - 2/*dconst_1*/, 1/*bipush*/, 1/*sipush*/, 1/*ldc*/, 1/*ldc_w*/, 2/*ldc2_w*/, 1/*iload*/, - 2/*lload*/, 1/*fload*/, 2/*dload*/, 1/*aload*/, 1/*iload_0*/, 1/*iload_1*/, 1/*iload_2*/, - 1/*iload_3*/, 2/*lload_0*/, 2/*lload_1*/, 2/*lload_2*/, 2/*lload_3*/, 1/*fload_0*/, - 1/*fload_1*/, 1/*fload_2*/, 1/*fload_3*/, 2/*dload_0*/, 2/*dload_1*/, 2/*dload_2*/, - 2/*dload_3*/, 1/*aload_0*/, 1/*aload_1*/, 1/*aload_2*/, 1/*aload_3*/, 1/*iaload*/, - 2/*laload*/, 1/*faload*/, 2/*daload*/, 1/*aaload*/, 1/*baload*/, 1/*caload*/, 1/*saload*/, - 0/*istore*/, 0/*lstore*/, 0/*fstore*/, 0/*dstore*/, 0/*astore*/, 0/*istore_0*/, - 0/*istore_1*/, 0/*istore_2*/, 0/*istore_3*/, 0/*lstore_0*/, 0/*lstore_1*/, - 0/*lstore_2*/, 0/*lstore_3*/, 0/*fstore_0*/, 0/*fstore_1*/, 0/*fstore_2*/, - 0/*fstore_3*/, 0/*dstore_0*/, 0/*dstore_1*/, 0/*dstore_2*/, 0/*dstore_3*/, - 0/*astore_0*/, 0/*astore_1*/, 0/*astore_2*/, 0/*astore_3*/, 0/*iastore*/, 0/*lastore*/, - 0/*fastore*/, 0/*dastore*/, 0/*aastore*/, 0/*bastore*/, 0/*castore*/, 0/*sastore*/, - 0/*pop*/, 0/*pop2*/, 2/*dup*/, 3/*dup_x1*/, 4/*dup_x2*/, 4/*dup2*/, 5/*dup2_x1*/, - 6/*dup2_x2*/, 2/*swap*/, 1/*iadd*/, 2/*ladd*/, 1/*fadd*/, 2/*dadd*/, 1/*isub*/, 2/*lsub*/, - 1/*fsub*/, 2/*dsub*/, 1/*imul*/, 2/*lmul*/, 1/*fmul*/, 2/*dmul*/, 1/*idiv*/, 2/*ldiv*/, - 1/*fdiv*/, 2/*ddiv*/, 1/*irem*/, 2/*lrem*/, 1/*frem*/, 2/*drem*/, 1/*ineg*/, 2/*lneg*/, - 1/*fneg*/, 2/*dneg*/, 1/*ishl*/, 2/*lshl*/, 1/*ishr*/, 2/*lshr*/, 1/*iushr*/, 2/*lushr*/, - 1/*iand*/, 2/*land*/, 1/*ior*/, 2/*lor*/, 1/*ixor*/, 2/*lxor*/, - 0/*iinc*/, 2/*i2l*/, 1/*i2f*/, 2/*i2d*/, 1/*l2i*/, 1/*l2f*/, 2/*l2d*/, 1/*f2i*/, - 2/*f2l*/, 2/*f2d*/, 1/*d2i*/, 2/*d2l*/, 1/*d2f*/, - 1/*i2b*/, 1/*i2c*/, 1/*i2s*/, 1/*lcmp*/, 1/*fcmpl*/, 1/*fcmpg*/, - 1/*dcmpl*/, 1/*dcmpg*/, 0/*ifeq*/, 0/*ifne*/, 0/*iflt*/, 0/*ifge*/, 0/*ifgt*/, 0/*ifle*/, - 0/*if_icmpeq*/, 0/*if_icmpne*/, 0/*if_icmplt*/, 0/*if_icmpge*/, 0/*if_icmpgt*/, - 0/*if_icmple*/, 0/*if_acmpeq*/, 0/*if_acmpne*/, 0/*goto*/, 1/*jsr*/, 0/*ret*/, - 0/*tableswitch*/, 0/*lookupswitch*/, 0/*ireturn*/, 0/*lreturn*/, 0/*freturn*/, - 0/*dreturn*/, 0/*areturn*/, 0/*return*/, UNPREDICTABLE/*getstatic*/, 0/*putstatic*/, - UNPREDICTABLE/*getfield*/, 0/*putfield*/, UNPREDICTABLE/*invokevirtual*/, - UNPREDICTABLE/*invokespecial*/, UNPREDICTABLE/*invokestatic*/, - UNPREDICTABLE/*invokeinterface*/, UNPREDICTABLE/*invokedynamic*/, 1/*new*/, 1/*newarray*/, 1/*anewarray*/, - 1/*arraylength*/, 1/*athrow*/, 1/*checkcast*/, 1/*instanceof*/, 0/*monitorenter*/, - 0/*monitorexit*/, 0/*wide*/, 1/*multianewarray*/, 0/*ifnull*/, 0/*ifnonnull*/, - 0/*goto_w*/, 1/*jsr_w*/, 0/*breakpoint*/, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNPREDICTABLE/*impdep1*/, UNPREDICTABLE/*impdep2*/ - }; - - /** - * - * @param index - * @return Number of words produced onto operand stack - * @since 6.0 - */ - public static int getProduceStack(final int index) { - return PRODUCE_STACK[index]; - } - - /** Attributes and their corresponding names. - */ - public static final byte ATTR_UNKNOWN = -1; - public static final byte ATTR_SOURCE_FILE = 0; - public static final byte ATTR_CONSTANT_VALUE = 1; - public static final byte ATTR_CODE = 2; - public static final byte ATTR_EXCEPTIONS = 3; - public static final byte ATTR_LINE_NUMBER_TABLE = 4; - public static final byte ATTR_LOCAL_VARIABLE_TABLE = 5; - public static final byte ATTR_INNER_CLASSES = 6; - public static final byte ATTR_SYNTHETIC = 7; - public static final byte ATTR_DEPRECATED = 8; - public static final byte ATTR_PMG = 9; - public static final byte ATTR_SIGNATURE = 10; - public static final byte ATTR_STACK_MAP = 11; - public static final byte ATTR_RUNTIME_VISIBLE_ANNOTATIONS = 12; - public static final byte ATTR_RUNTIME_INVISIBLE_ANNOTATIONS = 13; - public static final byte ATTR_RUNTIME_VISIBLE_PARAMETER_ANNOTATIONS = 14; - public static final byte ATTR_RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS = 15; - public static final byte ATTR_ANNOTATION_DEFAULT = 16; - public static final byte ATTR_LOCAL_VARIABLE_TYPE_TABLE = 17; - public static final byte ATTR_ENCLOSING_METHOD = 18; - public static final byte ATTR_STACK_MAP_TABLE = 19; - public static final byte ATTR_BOOTSTRAP_METHODS = 20; - public static final byte ATTR_METHOD_PARAMETERS = 21; - public static final byte ATTR_MODULE = 22; - public static final byte ATTR_MODULE_PACKAGES = 23; - public static final byte ATTR_MODULE_MAIN_CLASS = 24; - public static final byte ATTR_NEST_HOST = 25; - public static final byte ATTR_NEST_MEMBERS = 26; - - public static final short KNOWN_ATTRIBUTES = 27; // count of attributes - - private static final String[] ATTRIBUTE_NAMES = { - "SourceFile", "ConstantValue", "Code", "Exceptions", - "LineNumberTable", "LocalVariableTable", - "InnerClasses", "Synthetic", "Deprecated", - "PMGClass", "Signature", "StackMap", - "RuntimeVisibleAnnotations", "RuntimeInvisibleAnnotations", - "RuntimeVisibleParameterAnnotations", "RuntimeInvisibleParameterAnnotations", - "AnnotationDefault", "LocalVariableTypeTable", "EnclosingMethod", "StackMapTable", - "BootstrapMethods", "MethodParameters", "Module", "ModulePackages", - "ModuleMainClass", "NestHost", "NestMembers" - }; - - /** - * - * @param index - * @return the attribute name - * @since 6.0 - */ - public static String getAttributeName(final int index) { - return ATTRIBUTE_NAMES[index]; - } - - /** Constants used in the StackMap attribute. - */ - public static final byte ITEM_Bogus = 0; - public static final byte ITEM_Integer = 1; - public static final byte ITEM_Float = 2; - public static final byte ITEM_Double = 3; - public static final byte ITEM_Long = 4; - public static final byte ITEM_Null = 5; - public static final byte ITEM_InitObject = 6; - public static final byte ITEM_Object = 7; - public static final byte ITEM_NewObject = 8; - - private static final String[] ITEM_NAMES = { - "Bogus", "Integer", "Float", "Double", "Long", - "Null", "InitObject", "Object", "NewObject" - }; - - /** - * - * @param index - * @return the item name - * @since 6.0 - */ - public static String getItemName(final int index) { - return ITEM_NAMES[index]; - } - - /** Constants used to identify StackMapEntry types. - * - * For those types which can specify a range, the - * constant names the lowest value. - */ - public static final int SAME_FRAME = 0; - public static final int SAME_LOCALS_1_STACK_ITEM_FRAME = 64; - public static final int SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED = 247; - public static final int CHOP_FRAME = 248; - public static final int SAME_FRAME_EXTENDED = 251; - public static final int APPEND_FRAME = 252; - public static final int FULL_FRAME = 255; - - /** Constants that define the maximum value of - * those constants which store ranges. */ - - public static final int SAME_FRAME_MAX = 63; - public static final int SAME_LOCALS_1_STACK_ITEM_FRAME_MAX = 127; - public static final int CHOP_FRAME_MAX = 250; - public static final int APPEND_FRAME_MAX = 254; - - - // Constants defining the behavior of the Method Handles (JVMS �5.4.3.5) - - public static final byte REF_getField = 1; - public static final byte REF_getStatic = 2; - public static final byte REF_putField = 3; - public static final byte REF_putStatic = 4; - public static final byte REF_invokeVirtual = 5; - public static final byte REF_invokeStatic = 6; - public static final byte REF_invokeSpecial = 7; - public static final byte REF_newInvokeSpecial = 8; - public static final byte REF_invokeInterface = 9; - - /** - * The names of the reference_kinds of a CONSTANT_MethodHandle_info. - */ - private static final String[] METHODHANDLE_NAMES = { - "", "getField", "getStatic", "putField", "putStatic", "invokeVirtual", - "invokeStatic", "invokeSpecial", "newInvokeSpecial", "invokeInterface" }; - - /** - * - * @param index - * @return the method handle name - * @since 6.0 - */ - public static String getMethodHandleName(final int index) { - return METHODHANDLE_NAMES[index]; - } - - private Const() { } // not instantiable - -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/Constants.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/Constants.java deleted file mode 100644 index 07ec9228..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/Constants.java +++ /dev/null @@ -1,1697 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel; - -/** - * Constants for the project, mostly defined in the JVM specification. - * - * @deprecated (since 6.0) DO NOT USE - use Const instead - */ -@Deprecated -public interface Constants { - - /** Major version number of class files for Java 1.1. - * @see #MINOR_1_1 - * */ - short MAJOR_1_1 = 45; - - /** Minor version number of class files for Java 1.1. - * @see #MAJOR_1_1 - * */ - short MINOR_1_1 = 3; - - /** Major version number of class files for Java 1.2. - * @see #MINOR_1_2 - * */ - short MAJOR_1_2 = 46; - - /** Minor version number of class files for Java 1.2. - * @see #MAJOR_1_2 - * */ - short MINOR_1_2 = 0; - - /** Major version number of class files for Java 1.2. - * @see #MINOR_1_2 - * */ - short MAJOR_1_3 = 47; - - /** Minor version number of class files for Java 1.3. - * @see #MAJOR_1_3 - * */ - short MINOR_1_3 = 0; - - /** Major version number of class files for Java 1.3. - * @see #MINOR_1_3 - * */ - short MAJOR_1_4 = 48; - - /** Minor version number of class files for Java 1.4. - * @see #MAJOR_1_4 - * */ - short MINOR_1_4 = 0; - - /** Major version number of class files for Java 1.4. - * @see #MINOR_1_4 - * */ - short MAJOR_1_5 = 49; - - /** Minor version number of class files for Java 1.5. - * @see #MAJOR_1_5 - * */ - short MINOR_1_5 = 0; - - - /** Default major version number. Class file is for Java 1.1. - * @see #MAJOR_1_1 - * */ - short MAJOR = MAJOR_1_1; - - /** Default major version number. Class file is for Java 1.1. - * @see #MAJOR_1_1 - * */ - short MINOR = MINOR_1_1; - - /** Maximum value for an unsigned short. - */ - int MAX_SHORT = 65535; // 2^16 - 1 - - /** Maximum value for an unsigned byte. - */ - int MAX_BYTE = 255; // 2^8 - 1 - - /** One of the access flags for fields, methods, or classes. - * - * @see - * Flag definitions for Fields in the Java Virtual Machine Specification (Java SE 8 Edition). - * @see - * Flag definitions for Methods in the Java Virtual Machine Specification (Java SE 8 Edition). - * @see - * Flag definitions for Classes in the Java Virtual Machine Specification (Java SE 8 Edition). - */ - short ACC_PUBLIC = 0x0001; - - /** One of the access flags for fields, methods, or classes. - * @see #ACC_PUBLIC - */ - short ACC_PRIVATE = 0x0002; - - /** One of the access flags for fields, methods, or classes. - * @see #ACC_PUBLIC - */ - short ACC_PROTECTED = 0x0004; - - /** One of the access flags for fields, methods, or classes. - * @see #ACC_PUBLIC - */ - short ACC_STATIC = 0x0008; - - /** One of the access flags for fields, methods, or classes. - * @see #ACC_PUBLIC - */ - short ACC_FINAL = 0x0010; - - /** One of the access flags for fields, methods, or classes. - * @see #ACC_PUBLIC - */ - short ACC_SYNCHRONIZED = 0x0020; - - /** One of the access flags for fields, methods, or classes. - * @see #ACC_PUBLIC - */ - short ACC_VOLATILE = 0x0040; - - /** One of the access flags for fields, methods, or classes. - * @see #ACC_PUBLIC - */ - short ACC_BRIDGE = 0x0040; - - /** One of the access flags for fields, methods, or classes. - * @see #ACC_PUBLIC - */ - short ACC_TRANSIENT = 0x0080; - - /** One of the access flags for fields, methods, or classes. - * @see #ACC_PUBLIC - */ - short ACC_VARARGS = 0x0080; - - /** One of the access flags for fields, methods, or classes. - * @see #ACC_PUBLIC - */ - short ACC_NATIVE = 0x0100; - - /** One of the access flags for fields, methods, or classes. - * @see #ACC_PUBLIC - */ - short ACC_INTERFACE = 0x0200; - - /** One of the access flags for fields, methods, or classes. - * @see #ACC_PUBLIC - */ - short ACC_ABSTRACT = 0x0400; - - /** One of the access flags for fields, methods, or classes. - * @see #ACC_PUBLIC - */ - short ACC_STRICT = 0x0800; - - /** One of the access flags for fields, methods, or classes. - * @see #ACC_PUBLIC - */ - short ACC_SYNTHETIC = 0x1000; - - /** One of the access flags for fields, methods, or classes. - * @see #ACC_PUBLIC - */ - short ACC_ANNOTATION = 0x2000; - - /** One of the access flags for fields, methods, or classes. - * @see #ACC_PUBLIC - */ - short ACC_ENUM = 0x4000; - - // Applies to classes compiled by new compilers only - /** One of the access flags for fields, methods, or classes. - * @see #ACC_PUBLIC - */ - short ACC_SUPER = 0x0020; - - /** One of the access flags for fields, methods, or classes. - * @see #ACC_PUBLIC - */ - short MAX_ACC_FLAG = ACC_ENUM; - - /** The names of the access flags. */ - String[] ACCESS_NAMES = { - "public", "private", "protected", "static", "final", "synchronized", - "volatile", "transient", "native", "interface", "abstract", "strictfp", - "synthetic", "annotation", "enum" - }; - - /** Marks a constant pool entry as type UTF-8. */ - byte CONSTANT_Utf8 = 1; - - /** Marks a constant pool entry as type Integer. */ - byte CONSTANT_Integer = 3; - - /** Marks a constant pool entry as type Float. */ - byte CONSTANT_Float = 4; - - /** Marks a constant pool entry as type Long. */ - byte CONSTANT_Long = 5; - - /** Marks a constant pool entry as type Double. */ - byte CONSTANT_Double = 6; - - /** Marks a constant pool entry as a Class. */ - byte CONSTANT_Class = 7; - - /** Marks a constant pool entry as a Field Reference. */ - byte CONSTANT_Fieldref = 9; - - /** Marks a constant pool entry as type String. */ - byte CONSTANT_String = 8; - - /** Marks a constant pool entry as a Method Reference. */ - byte CONSTANT_Methodref = 10; - - /** Marks a constant pool entry as an Interface Method Reference. */ - byte CONSTANT_InterfaceMethodref = 11; - - /** Marks a constant pool entry as a name and type. */ - byte CONSTANT_NameAndType = 12; - - /** The names of the types of entries in a constant pool. */ - String[] CONSTANT_NAMES = { - "", "CONSTANT_Utf8", "", "CONSTANT_Integer", - "CONSTANT_Float", "CONSTANT_Long", "CONSTANT_Double", - "CONSTANT_Class", "CONSTANT_String", "CONSTANT_Fieldref", - "CONSTANT_Methodref", "CONSTANT_InterfaceMethodref", - "CONSTANT_NameAndType" }; - - /** The name of the static initializer, also called "class - * initialization method" or "interface initialization - * method". This is "<clinit>". - */ - String STATIC_INITIALIZER_NAME = ""; - - /** The name of every constructor method in a class, also called - * "instance initialization method". This is "<init>". - */ - String CONSTRUCTOR_NAME = ""; - - /** The names of the interfaces implemented by arrays */ - String[] INTERFACES_IMPLEMENTED_BY_ARRAYS = {"java.lang.Cloneable", "java.io.Serializable"}; - - /** - * One of the limitations of the Java Virtual Machine. - * @see - * The Java Virtual Machine Specification, Second Edition, page 152, chapter 4.10. - */ - int MAX_CP_ENTRIES = 65535; - - /** - * One of the limitations of the Java Virtual Machine. - * @see - * The Java Virtual Machine Specification, Second Edition, page 152, chapter 4.10. - */ - int MAX_CODE_SIZE = 65536; //bytes - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short NOP = 0; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short ACONST_NULL = 1; - - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short ICONST_M1 = 2; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short ICONST_0 = 3; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short ICONST_1 = 4; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short ICONST_2 = 5; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short ICONST_3 = 6; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short ICONST_4 = 7; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short ICONST_5 = 8; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short LCONST_0 = 9; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short LCONST_1 = 10; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short FCONST_0 = 11; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short FCONST_1 = 12; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short FCONST_2 = 13; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short DCONST_0 = 14; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short DCONST_1 = 15; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short BIPUSH = 16; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short SIPUSH = 17; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short LDC = 18; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short LDC_W = 19; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short LDC2_W = 20; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short ILOAD = 21; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short LLOAD = 22; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short FLOAD = 23; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short DLOAD = 24; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short ALOAD = 25; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short ILOAD_0 = 26; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short ILOAD_1 = 27; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short ILOAD_2 = 28; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short ILOAD_3 = 29; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short LLOAD_0 = 30; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short LLOAD_1 = 31; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short LLOAD_2 = 32; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short LLOAD_3 = 33; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short FLOAD_0 = 34; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short FLOAD_1 = 35; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short FLOAD_2 = 36; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short FLOAD_3 = 37; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short DLOAD_0 = 38; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short DLOAD_1 = 39; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short DLOAD_2 = 40; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short DLOAD_3 = 41; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short ALOAD_0 = 42; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short ALOAD_1 = 43; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short ALOAD_2 = 44; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short ALOAD_3 = 45; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short IALOAD = 46; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short LALOAD = 47; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short FALOAD = 48; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short DALOAD = 49; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short AALOAD = 50; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short BALOAD = 51; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short CALOAD = 52; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short SALOAD = 53; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short ISTORE = 54; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short LSTORE = 55; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short FSTORE = 56; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short DSTORE = 57; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short ASTORE = 58; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short ISTORE_0 = 59; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short ISTORE_1 = 60; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short ISTORE_2 = 61; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short ISTORE_3 = 62; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short LSTORE_0 = 63; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short LSTORE_1 = 64; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short LSTORE_2 = 65; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short LSTORE_3 = 66; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short FSTORE_0 = 67; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short FSTORE_1 = 68; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short FSTORE_2 = 69; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short FSTORE_3 = 70; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short DSTORE_0 = 71; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short DSTORE_1 = 72; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short DSTORE_2 = 73; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short DSTORE_3 = 74; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short ASTORE_0 = 75; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short ASTORE_1 = 76; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short ASTORE_2 = 77; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short ASTORE_3 = 78; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short IASTORE = 79; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short LASTORE = 80; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short FASTORE = 81; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short DASTORE = 82; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short AASTORE = 83; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short BASTORE = 84; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short CASTORE = 85; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short SASTORE = 86; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short POP = 87; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short POP2 = 88; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short DUP = 89; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short DUP_X1 = 90; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short DUP_X2 = 91; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short DUP2 = 92; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short DUP2_X1 = 93; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short DUP2_X2 = 94; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short SWAP = 95; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short IADD = 96; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short LADD = 97; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short FADD = 98; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short DADD = 99; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short ISUB = 100; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short LSUB = 101; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short FSUB = 102; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short DSUB = 103; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short IMUL = 104; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short LMUL = 105; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short FMUL = 106; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short DMUL = 107; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short IDIV = 108; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short LDIV = 109; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short FDIV = 110; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short DDIV = 111; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short IREM = 112; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short LREM = 113; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short FREM = 114; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short DREM = 115; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short INEG = 116; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short LNEG = 117; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short FNEG = 118; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short DNEG = 119; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short ISHL = 120; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short LSHL = 121; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short ISHR = 122; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short LSHR = 123; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short IUSHR = 124; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short LUSHR = 125; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short IAND = 126; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short LAND = 127; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short IOR = 128; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short LOR = 129; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short IXOR = 130; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short LXOR = 131; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short IINC = 132; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short I2L = 133; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short I2F = 134; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short I2D = 135; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short L2I = 136; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short L2F = 137; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short L2D = 138; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short F2I = 139; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short F2L = 140; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short F2D = 141; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short D2I = 142; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short D2L = 143; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short D2F = 144; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short I2B = 145; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short INT2BYTE = 145; // Old notion - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short I2C = 146; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short INT2CHAR = 146; // Old notion - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short I2S = 147; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short INT2SHORT = 147; // Old notion - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short LCMP = 148; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short FCMPL = 149; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short FCMPG = 150; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short DCMPL = 151; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short DCMPG = 152; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short IFEQ = 153; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short IFNE = 154; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short IFLT = 155; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short IFGE = 156; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short IFGT = 157; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short IFLE = 158; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short IF_ICMPEQ = 159; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short IF_ICMPNE = 160; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short IF_ICMPLT = 161; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short IF_ICMPGE = 162; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short IF_ICMPGT = 163; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short IF_ICMPLE = 164; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short IF_ACMPEQ = 165; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short IF_ACMPNE = 166; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short GOTO = 167; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short JSR = 168; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short RET = 169; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short TABLESWITCH = 170; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short LOOKUPSWITCH = 171; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short IRETURN = 172; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short LRETURN = 173; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short FRETURN = 174; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short DRETURN = 175; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short ARETURN = 176; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short RETURN = 177; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short GETSTATIC = 178; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short PUTSTATIC = 179; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short GETFIELD = 180; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short PUTFIELD = 181; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short INVOKEVIRTUAL = 182; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short INVOKESPECIAL = 183; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short INVOKENONVIRTUAL = 183; // Old name in JDK 1.0 - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short INVOKESTATIC = 184; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short INVOKEINTERFACE = 185; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short INVOKEDYNAMIC = 186; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short NEW = 187; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short NEWARRAY = 188; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short ANEWARRAY = 189; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short ARRAYLENGTH = 190; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short ATHROW = 191; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short CHECKCAST = 192; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short INSTANCEOF = 193; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short MONITORENTER = 194; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short MONITOREXIT = 195; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short WIDE = 196; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short MULTIANEWARRAY = 197; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short IFNULL = 198; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short IFNONNULL = 199; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short GOTO_W = 200; - /** Java VM opcode. - * @see - * Opcode definitions in The Java Virtual Machine Specification */ - short JSR_W = 201; - - /** JVM internal opcode. - * @see - * Reserved opcodes in the Java Virtual Machine Specification */ - short BREAKPOINT = 202; - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - short LDC_QUICK = 203; - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - short LDC_W_QUICK = 204; - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - short LDC2_W_QUICK = 205; - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - short GETFIELD_QUICK = 206; - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - short PUTFIELD_QUICK = 207; - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - short GETFIELD2_QUICK = 208; - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - short PUTFIELD2_QUICK = 209; - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - short GETSTATIC_QUICK = 210; - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - short PUTSTATIC_QUICK = 211; - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - short GETSTATIC2_QUICK = 212; - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - short PUTSTATIC2_QUICK = 213; - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - short INVOKEVIRTUAL_QUICK = 214; - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - short INVOKENONVIRTUAL_QUICK = 215; - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - short INVOKESUPER_QUICK = 216; - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - short INVOKESTATIC_QUICK = 217; - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - short INVOKEINTERFACE_QUICK = 218; - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - short INVOKEVIRTUALOBJECT_QUICK = 219; - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - short NEW_QUICK = 221; - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - short ANEWARRAY_QUICK = 222; - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - short MULTIANEWARRAY_QUICK = 223; - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - short CHECKCAST_QUICK = 224; - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - short INSTANCEOF_QUICK = 225; - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - short INVOKEVIRTUAL_QUICK_W = 226; - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - short GETFIELD_QUICK_W = 227; - /** JVM internal opcode. - * @see - * Specification of _quick opcodes in the Java Virtual Machine Specification (version 1) - * @see - * Why the _quick opcodes were removed from the second version of the Java Virtual Machine Specification. */ - short PUTFIELD_QUICK_W = 228; - /** JVM internal opcode. - * @see - * Reserved opcodes in the Java Virtual Machine Specification */ - short IMPDEP1 = 254; - /** JVM internal opcode. - * @see - * Reserved opcodes in the Java Virtual Machine Specification */ - short IMPDEP2 = 255; - - /** - * BCEL virtual instruction for pushing an arbitrary data type onto the stack. Will be converted to the appropriate JVM - * opcode when the class is dumped. - */ - short PUSH = 4711; - /** - * BCEL virtual instruction for either LOOKUPSWITCH or TABLESWITCH. Will be converted to the appropriate JVM - * opcode when the class is dumped. - */ - short SWITCH = 4712; - - /** Illegal opcode. */ - short UNDEFINED = -1; - /** Illegal opcode. */ - short UNPREDICTABLE = -2; - /** Illegal opcode. */ - short RESERVED = -3; - /** Mnemonic for an illegal opcode. */ - String ILLEGAL_OPCODE = ""; - /** Mnemonic for an illegal type. */ - String ILLEGAL_TYPE = ""; - - /** Boolean data type. */ - byte T_BOOLEAN = 4; - /** Char data type. */ - byte T_CHAR = 5; - /** Float data type. */ - byte T_FLOAT = 6; - /** Double data type. */ - byte T_DOUBLE = 7; - /** Byte data type. */ - byte T_BYTE = 8; - /** Short data type. */ - byte T_SHORT = 9; - /** Int data type. */ - byte T_INT = 10; - /** Long data type. */ - byte T_LONG = 11; - - /** Void data type (non-standard). */ - byte T_VOID = 12; // Non-standard - /** Array data type. */ - byte T_ARRAY = 13; - /** Object data type. */ - byte T_OBJECT = 14; - /** Reference data type (deprecated). */ - byte T_REFERENCE = 14; // Deprecated - /** Unknown data type. */ - byte T_UNKNOWN = 15; - /** Address data type. */ - byte T_ADDRESS = 16; - - /** The primitive type names corresponding to the T_XX constants, - * e.g., TYPE_NAMES[T_INT] = "int" - */ - String[] TYPE_NAMES = { - ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE, - "boolean", "char", "float", "double", "byte", "short", "int", "long", - "void", "array", "object", "unknown", "address" - }; - - /** The primitive class names corresponding to the T_XX constants, - * e.g., CLASS_TYPE_NAMES[T_INT] = "java.lang.Integer" - */ - String[] CLASS_TYPE_NAMES = { - ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE, - "java.lang.Boolean", "java.lang.Character", "java.lang.Float", - "java.lang.Double", "java.lang.Byte", "java.lang.Short", - "java.lang.Integer", "java.lang.Long", "java.lang.Void", - ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE - }; - - /** The signature characters corresponding to primitive types, - * e.g., SHORT_TYPE_NAMES[T_INT] = "I" - */ - String[] SHORT_TYPE_NAMES = { - ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE, - "Z", "C", "F", "D", "B", "S", "I", "J", - "V", ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE - }; - - /** - * Number of byte code operands for each opcode, i.e., number of bytes after the tag byte - * itself. Indexed by opcode, so NO_OF_OPERANDS[BIPUSH] = the number of operands for a bipush - * instruction. - */ - short[] NO_OF_OPERANDS = { - 0/*nop*/, 0/*aconst_null*/, 0/*iconst_m1*/, 0/*iconst_0*/, - 0/*iconst_1*/, 0/*iconst_2*/, 0/*iconst_3*/, 0/*iconst_4*/, - 0/*iconst_5*/, 0/*lconst_0*/, 0/*lconst_1*/, 0/*fconst_0*/, - 0/*fconst_1*/, 0/*fconst_2*/, 0/*dconst_0*/, 0/*dconst_1*/, - 1/*bipush*/, 2/*sipush*/, 1/*ldc*/, 2/*ldc_w*/, 2/*ldc2_w*/, - 1/*iload*/, 1/*lload*/, 1/*fload*/, 1/*dload*/, 1/*aload*/, - 0/*iload_0*/, 0/*iload_1*/, 0/*iload_2*/, 0/*iload_3*/, - 0/*lload_0*/, 0/*lload_1*/, 0/*lload_2*/, 0/*lload_3*/, - 0/*fload_0*/, 0/*fload_1*/, 0/*fload_2*/, 0/*fload_3*/, - 0/*dload_0*/, 0/*dload_1*/, 0/*dload_2*/, 0/*dload_3*/, - 0/*aload_0*/, 0/*aload_1*/, 0/*aload_2*/, 0/*aload_3*/, - 0/*iaload*/, 0/*laload*/, 0/*faload*/, 0/*daload*/, - 0/*aaload*/, 0/*baload*/, 0/*caload*/, 0/*saload*/, - 1/*istore*/, 1/*lstore*/, 1/*fstore*/, 1/*dstore*/, - 1/*astore*/, 0/*istore_0*/, 0/*istore_1*/, 0/*istore_2*/, - 0/*istore_3*/, 0/*lstore_0*/, 0/*lstore_1*/, 0/*lstore_2*/, - 0/*lstore_3*/, 0/*fstore_0*/, 0/*fstore_1*/, 0/*fstore_2*/, - 0/*fstore_3*/, 0/*dstore_0*/, 0/*dstore_1*/, 0/*dstore_2*/, - 0/*dstore_3*/, 0/*astore_0*/, 0/*astore_1*/, 0/*astore_2*/, - 0/*astore_3*/, 0/*iastore*/, 0/*lastore*/, 0/*fastore*/, - 0/*dastore*/, 0/*aastore*/, 0/*bastore*/, 0/*castore*/, - 0/*sastore*/, 0/*pop*/, 0/*pop2*/, 0/*dup*/, 0/*dup_x1*/, - 0/*dup_x2*/, 0/*dup2*/, 0/*dup2_x1*/, 0/*dup2_x2*/, 0/*swap*/, - 0/*iadd*/, 0/*ladd*/, 0/*fadd*/, 0/*dadd*/, 0/*isub*/, - 0/*lsub*/, 0/*fsub*/, 0/*dsub*/, 0/*imul*/, 0/*lmul*/, - 0/*fmul*/, 0/*dmul*/, 0/*idiv*/, 0/*ldiv*/, 0/*fdiv*/, - 0/*ddiv*/, 0/*irem*/, 0/*lrem*/, 0/*frem*/, 0/*drem*/, - 0/*ineg*/, 0/*lneg*/, 0/*fneg*/, 0/*dneg*/, 0/*ishl*/, - 0/*lshl*/, 0/*ishr*/, 0/*lshr*/, 0/*iushr*/, 0/*lushr*/, - 0/*iand*/, 0/*land*/, 0/*ior*/, 0/*lor*/, 0/*ixor*/, 0/*lxor*/, - 2/*iinc*/, 0/*i2l*/, 0/*i2f*/, 0/*i2d*/, 0/*l2i*/, 0/*l2f*/, - 0/*l2d*/, 0/*f2i*/, 0/*f2l*/, 0/*f2d*/, 0/*d2i*/, 0/*d2l*/, - 0/*d2f*/, 0/*i2b*/, 0/*i2c*/, 0/*i2s*/, 0/*lcmp*/, 0/*fcmpl*/, - 0/*fcmpg*/, 0/*dcmpl*/, 0/*dcmpg*/, 2/*ifeq*/, 2/*ifne*/, - 2/*iflt*/, 2/*ifge*/, 2/*ifgt*/, 2/*ifle*/, 2/*if_icmpeq*/, - 2/*if_icmpne*/, 2/*if_icmplt*/, 2/*if_icmpge*/, 2/*if_icmpgt*/, - 2/*if_icmple*/, 2/*if_acmpeq*/, 2/*if_acmpne*/, 2/*goto*/, - 2/*jsr*/, 1/*ret*/, UNPREDICTABLE/*tableswitch*/, UNPREDICTABLE/*lookupswitch*/, - 0/*ireturn*/, 0/*lreturn*/, 0/*freturn*/, - 0/*dreturn*/, 0/*areturn*/, 0/*return*/, - 2/*getstatic*/, 2/*putstatic*/, 2/*getfield*/, - 2/*putfield*/, 2/*invokevirtual*/, 2/*invokespecial*/, 2/*invokestatic*/, - 4/*invokeinterface*/, 4/*invokedynamic*/, 2/*new*/, - 1/*newarray*/, 2/*anewarray*/, - 0/*arraylength*/, 0/*athrow*/, 2/*checkcast*/, - 2/*instanceof*/, 0/*monitorenter*/, - 0/*monitorexit*/, UNPREDICTABLE/*wide*/, 3/*multianewarray*/, - 2/*ifnull*/, 2/*ifnonnull*/, 4/*goto_w*/, - 4/*jsr_w*/, 0/*breakpoint*/, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, RESERVED/*impdep1*/, RESERVED/*impdep2*/ - }; - - /** - * How the byte code operands are to be interpreted for each opcode. - * Indexed by opcode. TYPE_OF_OPERANDS[ILOAD] = an array of shorts - * describing the data types for the instruction. - */ - short[][] TYPE_OF_OPERANDS = { - {}/*nop*/, {}/*aconst_null*/, {}/*iconst_m1*/, {}/*iconst_0*/, - {}/*iconst_1*/, {}/*iconst_2*/, {}/*iconst_3*/, {}/*iconst_4*/, - {}/*iconst_5*/, {}/*lconst_0*/, {}/*lconst_1*/, {}/*fconst_0*/, - {}/*fconst_1*/, {}/*fconst_2*/, {}/*dconst_0*/, {}/*dconst_1*/, - {T_BYTE}/*bipush*/, {T_SHORT}/*sipush*/, {T_BYTE}/*ldc*/, - {T_SHORT}/*ldc_w*/, {T_SHORT}/*ldc2_w*/, - {T_BYTE}/*iload*/, {T_BYTE}/*lload*/, {T_BYTE}/*fload*/, - {T_BYTE}/*dload*/, {T_BYTE}/*aload*/, {}/*iload_0*/, - {}/*iload_1*/, {}/*iload_2*/, {}/*iload_3*/, {}/*lload_0*/, - {}/*lload_1*/, {}/*lload_2*/, {}/*lload_3*/, {}/*fload_0*/, - {}/*fload_1*/, {}/*fload_2*/, {}/*fload_3*/, {}/*dload_0*/, - {}/*dload_1*/, {}/*dload_2*/, {}/*dload_3*/, {}/*aload_0*/, - {}/*aload_1*/, {}/*aload_2*/, {}/*aload_3*/, {}/*iaload*/, - {}/*laload*/, {}/*faload*/, {}/*daload*/, {}/*aaload*/, - {}/*baload*/, {}/*caload*/, {}/*saload*/, {T_BYTE}/*istore*/, - {T_BYTE}/*lstore*/, {T_BYTE}/*fstore*/, {T_BYTE}/*dstore*/, - {T_BYTE}/*astore*/, {}/*istore_0*/, {}/*istore_1*/, - {}/*istore_2*/, {}/*istore_3*/, {}/*lstore_0*/, {}/*lstore_1*/, - {}/*lstore_2*/, {}/*lstore_3*/, {}/*fstore_0*/, {}/*fstore_1*/, - {}/*fstore_2*/, {}/*fstore_3*/, {}/*dstore_0*/, {}/*dstore_1*/, - {}/*dstore_2*/, {}/*dstore_3*/, {}/*astore_0*/, {}/*astore_1*/, - {}/*astore_2*/, {}/*astore_3*/, {}/*iastore*/, {}/*lastore*/, - {}/*fastore*/, {}/*dastore*/, {}/*aastore*/, {}/*bastore*/, - {}/*castore*/, {}/*sastore*/, {}/*pop*/, {}/*pop2*/, {}/*dup*/, - {}/*dup_x1*/, {}/*dup_x2*/, {}/*dup2*/, {}/*dup2_x1*/, - {}/*dup2_x2*/, {}/*swap*/, {}/*iadd*/, {}/*ladd*/, {}/*fadd*/, - {}/*dadd*/, {}/*isub*/, {}/*lsub*/, {}/*fsub*/, {}/*dsub*/, - {}/*imul*/, {}/*lmul*/, {}/*fmul*/, {}/*dmul*/, {}/*idiv*/, - {}/*ldiv*/, {}/*fdiv*/, {}/*ddiv*/, {}/*irem*/, {}/*lrem*/, - {}/*frem*/, {}/*drem*/, {}/*ineg*/, {}/*lneg*/, {}/*fneg*/, - {}/*dneg*/, {}/*ishl*/, {}/*lshl*/, {}/*ishr*/, {}/*lshr*/, - {}/*iushr*/, {}/*lushr*/, {}/*iand*/, {}/*land*/, {}/*ior*/, - {}/*lor*/, {}/*ixor*/, {}/*lxor*/, {T_BYTE, T_BYTE}/*iinc*/, - {}/*i2l*/, {}/*i2f*/, {}/*i2d*/, {}/*l2i*/, {}/*l2f*/, {}/*l2d*/, - {}/*f2i*/, {}/*f2l*/, {}/*f2d*/, {}/*d2i*/, {}/*d2l*/, {}/*d2f*/, - {}/*i2b*/, {}/*i2c*/,{}/*i2s*/, {}/*lcmp*/, {}/*fcmpl*/, - {}/*fcmpg*/, {}/*dcmpl*/, {}/*dcmpg*/, {T_SHORT}/*ifeq*/, - {T_SHORT}/*ifne*/, {T_SHORT}/*iflt*/, {T_SHORT}/*ifge*/, - {T_SHORT}/*ifgt*/, {T_SHORT}/*ifle*/, {T_SHORT}/*if_icmpeq*/, - {T_SHORT}/*if_icmpne*/, {T_SHORT}/*if_icmplt*/, - {T_SHORT}/*if_icmpge*/, {T_SHORT}/*if_icmpgt*/, - {T_SHORT}/*if_icmple*/, {T_SHORT}/*if_acmpeq*/, - {T_SHORT}/*if_acmpne*/, {T_SHORT}/*goto*/, {T_SHORT}/*jsr*/, - {T_BYTE}/*ret*/, {}/*tableswitch*/, {}/*lookupswitch*/, - {}/*ireturn*/, {}/*lreturn*/, {}/*freturn*/, {}/*dreturn*/, - {}/*areturn*/, {}/*return*/, {T_SHORT}/*getstatic*/, - {T_SHORT}/*putstatic*/, {T_SHORT}/*getfield*/, - {T_SHORT}/*putfield*/, {T_SHORT}/*invokevirtual*/, - {T_SHORT}/*invokespecial*/, {T_SHORT}/*invokestatic*/, - {T_SHORT, T_BYTE, T_BYTE}/*invokeinterface*/, {T_SHORT, T_BYTE, T_BYTE}/*invokedynamic*/, - {T_SHORT}/*new*/, {T_BYTE}/*newarray*/, - {T_SHORT}/*anewarray*/, {}/*arraylength*/, {}/*athrow*/, - {T_SHORT}/*checkcast*/, {T_SHORT}/*instanceof*/, - {}/*monitorenter*/, {}/*monitorexit*/, {T_BYTE}/*wide*/, - {T_SHORT, T_BYTE}/*multianewarray*/, {T_SHORT}/*ifnull*/, - {T_SHORT}/*ifnonnull*/, {T_INT}/*goto_w*/, {T_INT}/*jsr_w*/, - {}/*breakpoint*/, {}, {}, {}, {}, {}, {}, {}, - {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, - {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, - {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, - {}/*impdep1*/, {}/*impdep2*/ - }; - - /** - * Names of opcodes. Indexed by opcode. OPCODE_NAMES[ALOAD] = "aload". - */ - String[] OPCODE_NAMES = { - "nop", "aconst_null", "iconst_m1", "iconst_0", "iconst_1", - "iconst_2", "iconst_3", "iconst_4", "iconst_5", "lconst_0", - "lconst_1", "fconst_0", "fconst_1", "fconst_2", "dconst_0", - "dconst_1", "bipush", "sipush", "ldc", "ldc_w", "ldc2_w", "iload", - "lload", "fload", "dload", "aload", "iload_0", "iload_1", "iload_2", - "iload_3", "lload_0", "lload_1", "lload_2", "lload_3", "fload_0", - "fload_1", "fload_2", "fload_3", "dload_0", "dload_1", "dload_2", - "dload_3", "aload_0", "aload_1", "aload_2", "aload_3", "iaload", - "laload", "faload", "daload", "aaload", "baload", "caload", "saload", - "istore", "lstore", "fstore", "dstore", "astore", "istore_0", - "istore_1", "istore_2", "istore_3", "lstore_0", "lstore_1", - "lstore_2", "lstore_3", "fstore_0", "fstore_1", "fstore_2", - "fstore_3", "dstore_0", "dstore_1", "dstore_2", "dstore_3", - "astore_0", "astore_1", "astore_2", "astore_3", "iastore", "lastore", - "fastore", "dastore", "aastore", "bastore", "castore", "sastore", - "pop", "pop2", "dup", "dup_x1", "dup_x2", "dup2", "dup2_x1", - "dup2_x2", "swap", "iadd", "ladd", "fadd", "dadd", "isub", "lsub", - "fsub", "dsub", "imul", "lmul", "fmul", "dmul", "idiv", "ldiv", - "fdiv", "ddiv", "irem", "lrem", "frem", "drem", "ineg", "lneg", - "fneg", "dneg", "ishl", "lshl", "ishr", "lshr", "iushr", "lushr", - "iand", "land", "ior", "lor", "ixor", "lxor", "iinc", "i2l", "i2f", - "i2d", "l2i", "l2f", "l2d", "f2i", "f2l", "f2d", "d2i", "d2l", "d2f", - "i2b", "i2c", "i2s", "lcmp", "fcmpl", "fcmpg", - "dcmpl", "dcmpg", "ifeq", "ifne", "iflt", "ifge", "ifgt", "ifle", - "if_icmpeq", "if_icmpne", "if_icmplt", "if_icmpge", "if_icmpgt", - "if_icmple", "if_acmpeq", "if_acmpne", "goto", "jsr", "ret", - "tableswitch", "lookupswitch", "ireturn", "lreturn", "freturn", - "dreturn", "areturn", "return", "getstatic", "putstatic", "getfield", - "putfield", "invokevirtual", "invokespecial", "invokestatic", - "invokeinterface", "invokedynamic", "new", "newarray", "anewarray", - "arraylength", "athrow", "checkcast", "instanceof", "monitorenter", - "monitorexit", "wide", "multianewarray", "ifnull", "ifnonnull", - "goto_w", "jsr_w", "breakpoint", ILLEGAL_OPCODE, ILLEGAL_OPCODE, - ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, - ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, - ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, - ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, - ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, - ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, - ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, - ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, - ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, - ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, - ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, - ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, - ILLEGAL_OPCODE, "impdep1", "impdep2" - }; - - /** - * Number of words consumed on operand stack by instructions. - * Indexed by opcode. CONSUME_STACK[FALOAD] = number of words - * consumed from the stack by a faload instruction. - */ - int[] CONSUME_STACK = { - 0/*nop*/, 0/*aconst_null*/, 0/*iconst_m1*/, 0/*iconst_0*/, 0/*iconst_1*/, - 0/*iconst_2*/, 0/*iconst_3*/, 0/*iconst_4*/, 0/*iconst_5*/, 0/*lconst_0*/, - 0/*lconst_1*/, 0/*fconst_0*/, 0/*fconst_1*/, 0/*fconst_2*/, 0/*dconst_0*/, - 0/*dconst_1*/, 0/*bipush*/, 0/*sipush*/, 0/*ldc*/, 0/*ldc_w*/, 0/*ldc2_w*/, 0/*iload*/, - 0/*lload*/, 0/*fload*/, 0/*dload*/, 0/*aload*/, 0/*iload_0*/, 0/*iload_1*/, 0/*iload_2*/, - 0/*iload_3*/, 0/*lload_0*/, 0/*lload_1*/, 0/*lload_2*/, 0/*lload_3*/, 0/*fload_0*/, - 0/*fload_1*/, 0/*fload_2*/, 0/*fload_3*/, 0/*dload_0*/, 0/*dload_1*/, 0/*dload_2*/, - 0/*dload_3*/, 0/*aload_0*/, 0/*aload_1*/, 0/*aload_2*/, 0/*aload_3*/, 2/*iaload*/, - 2/*laload*/, 2/*faload*/, 2/*daload*/, 2/*aaload*/, 2/*baload*/, 2/*caload*/, 2/*saload*/, - 1/*istore*/, 2/*lstore*/, 1/*fstore*/, 2/*dstore*/, 1/*astore*/, 1/*istore_0*/, - 1/*istore_1*/, 1/*istore_2*/, 1/*istore_3*/, 2/*lstore_0*/, 2/*lstore_1*/, - 2/*lstore_2*/, 2/*lstore_3*/, 1/*fstore_0*/, 1/*fstore_1*/, 1/*fstore_2*/, - 1/*fstore_3*/, 2/*dstore_0*/, 2/*dstore_1*/, 2/*dstore_2*/, 2/*dstore_3*/, - 1/*astore_0*/, 1/*astore_1*/, 1/*astore_2*/, 1/*astore_3*/, 3/*iastore*/, 4/*lastore*/, - 3/*fastore*/, 4/*dastore*/, 3/*aastore*/, 3/*bastore*/, 3/*castore*/, 3/*sastore*/, - 1/*pop*/, 2/*pop2*/, 1/*dup*/, 2/*dup_x1*/, 3/*dup_x2*/, 2/*dup2*/, 3/*dup2_x1*/, - 4/*dup2_x2*/, 2/*swap*/, 2/*iadd*/, 4/*ladd*/, 2/*fadd*/, 4/*dadd*/, 2/*isub*/, 4/*lsub*/, - 2/*fsub*/, 4/*dsub*/, 2/*imul*/, 4/*lmul*/, 2/*fmul*/, 4/*dmul*/, 2/*idiv*/, 4/*ldiv*/, - 2/*fdiv*/, 4/*ddiv*/, 2/*irem*/, 4/*lrem*/, 2/*frem*/, 4/*drem*/, 1/*ineg*/, 2/*lneg*/, - 1/*fneg*/, 2/*dneg*/, 2/*ishl*/, 3/*lshl*/, 2/*ishr*/, 3/*lshr*/, 2/*iushr*/, 3/*lushr*/, - 2/*iand*/, 4/*land*/, 2/*ior*/, 4/*lor*/, 2/*ixor*/, 4/*lxor*/, 0/*iinc*/, - 1/*i2l*/, 1/*i2f*/, 1/*i2d*/, 2/*l2i*/, 2/*l2f*/, 2/*l2d*/, 1/*f2i*/, 1/*f2l*/, - 1/*f2d*/, 2/*d2i*/, 2/*d2l*/, 2/*d2f*/, 1/*i2b*/, 1/*i2c*/, 1/*i2s*/, - 4/*lcmp*/, 2/*fcmpl*/, 2/*fcmpg*/, 4/*dcmpl*/, 4/*dcmpg*/, 1/*ifeq*/, 1/*ifne*/, - 1/*iflt*/, 1/*ifge*/, 1/*ifgt*/, 1/*ifle*/, 2/*if_icmpeq*/, 2/*if_icmpne*/, 2/*if_icmplt*/, - 2 /*if_icmpge*/, 2/*if_icmpgt*/, 2/*if_icmple*/, 2/*if_acmpeq*/, 2/*if_acmpne*/, - 0/*goto*/, 0/*jsr*/, 0/*ret*/, 1/*tableswitch*/, 1/*lookupswitch*/, 1/*ireturn*/, - 2/*lreturn*/, 1/*freturn*/, 2/*dreturn*/, 1/*areturn*/, 0/*return*/, 0/*getstatic*/, - UNPREDICTABLE/*putstatic*/, 1/*getfield*/, UNPREDICTABLE/*putfield*/, - UNPREDICTABLE/*invokevirtual*/, UNPREDICTABLE/*invokespecial*/, - UNPREDICTABLE/*invokestatic*/, - UNPREDICTABLE/*invokeinterface*/, UNPREDICTABLE/*invokedynamic*/, 0/*new*/, 1/*newarray*/, 1/*anewarray*/, - 1/*arraylength*/, 1/*athrow*/, 1/*checkcast*/, 1/*instanceof*/, 1/*monitorenter*/, - 1/*monitorexit*/, 0/*wide*/, UNPREDICTABLE/*multianewarray*/, 1/*ifnull*/, 1/*ifnonnull*/, - 0/*goto_w*/, 0/*jsr_w*/, 0/*breakpoint*/, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNPREDICTABLE/*impdep1*/, UNPREDICTABLE/*impdep2*/ - }; - - /** - * Number of words produced onto operand stack by instructions. - * Indexed by opcode. CONSUME_STACK[DALOAD] = number of words - * consumed from the stack by a daload instruction. - */ - int[] PRODUCE_STACK = { - 0/*nop*/, 1/*aconst_null*/, 1/*iconst_m1*/, 1/*iconst_0*/, 1/*iconst_1*/, - 1/*iconst_2*/, 1/*iconst_3*/, 1/*iconst_4*/, 1/*iconst_5*/, 2/*lconst_0*/, - 2/*lconst_1*/, 1/*fconst_0*/, 1/*fconst_1*/, 1/*fconst_2*/, 2/*dconst_0*/, - 2/*dconst_1*/, 1/*bipush*/, 1/*sipush*/, 1/*ldc*/, 1/*ldc_w*/, 2/*ldc2_w*/, 1/*iload*/, - 2/*lload*/, 1/*fload*/, 2/*dload*/, 1/*aload*/, 1/*iload_0*/, 1/*iload_1*/, 1/*iload_2*/, - 1/*iload_3*/, 2/*lload_0*/, 2/*lload_1*/, 2/*lload_2*/, 2/*lload_3*/, 1/*fload_0*/, - 1/*fload_1*/, 1/*fload_2*/, 1/*fload_3*/, 2/*dload_0*/, 2/*dload_1*/, 2/*dload_2*/, - 2/*dload_3*/, 1/*aload_0*/, 1/*aload_1*/, 1/*aload_2*/, 1/*aload_3*/, 1/*iaload*/, - 2/*laload*/, 1/*faload*/, 2/*daload*/, 1/*aaload*/, 1/*baload*/, 1/*caload*/, 1/*saload*/, - 0/*istore*/, 0/*lstore*/, 0/*fstore*/, 0/*dstore*/, 0/*astore*/, 0/*istore_0*/, - 0/*istore_1*/, 0/*istore_2*/, 0/*istore_3*/, 0/*lstore_0*/, 0/*lstore_1*/, - 0/*lstore_2*/, 0/*lstore_3*/, 0/*fstore_0*/, 0/*fstore_1*/, 0/*fstore_2*/, - 0/*fstore_3*/, 0/*dstore_0*/, 0/*dstore_1*/, 0/*dstore_2*/, 0/*dstore_3*/, - 0/*astore_0*/, 0/*astore_1*/, 0/*astore_2*/, 0/*astore_3*/, 0/*iastore*/, 0/*lastore*/, - 0/*fastore*/, 0/*dastore*/, 0/*aastore*/, 0/*bastore*/, 0/*castore*/, 0/*sastore*/, - 0/*pop*/, 0/*pop2*/, 2/*dup*/, 3/*dup_x1*/, 4/*dup_x2*/, 4/*dup2*/, 5/*dup2_x1*/, - 6/*dup2_x2*/, 2/*swap*/, 1/*iadd*/, 2/*ladd*/, 1/*fadd*/, 2/*dadd*/, 1/*isub*/, 2/*lsub*/, - 1/*fsub*/, 2/*dsub*/, 1/*imul*/, 2/*lmul*/, 1/*fmul*/, 2/*dmul*/, 1/*idiv*/, 2/*ldiv*/, - 1/*fdiv*/, 2/*ddiv*/, 1/*irem*/, 2/*lrem*/, 1/*frem*/, 2/*drem*/, 1/*ineg*/, 2/*lneg*/, - 1/*fneg*/, 2/*dneg*/, 1/*ishl*/, 2/*lshl*/, 1/*ishr*/, 2/*lshr*/, 1/*iushr*/, 2/*lushr*/, - 1/*iand*/, 2/*land*/, 1/*ior*/, 2/*lor*/, 1/*ixor*/, 2/*lxor*/, - 0/*iinc*/, 2/*i2l*/, 1/*i2f*/, 2/*i2d*/, 1/*l2i*/, 1/*l2f*/, 2/*l2d*/, 1/*f2i*/, - 2/*f2l*/, 2/*f2d*/, 1/*d2i*/, 2/*d2l*/, 1/*d2f*/, - 1/*i2b*/, 1/*i2c*/, 1/*i2s*/, 1/*lcmp*/, 1/*fcmpl*/, 1/*fcmpg*/, - 1/*dcmpl*/, 1/*dcmpg*/, 0/*ifeq*/, 0/*ifne*/, 0/*iflt*/, 0/*ifge*/, 0/*ifgt*/, 0/*ifle*/, - 0/*if_icmpeq*/, 0/*if_icmpne*/, 0/*if_icmplt*/, 0/*if_icmpge*/, 0/*if_icmpgt*/, - 0/*if_icmple*/, 0/*if_acmpeq*/, 0/*if_acmpne*/, 0/*goto*/, 1/*jsr*/, 0/*ret*/, - 0/*tableswitch*/, 0/*lookupswitch*/, 0/*ireturn*/, 0/*lreturn*/, 0/*freturn*/, - 0/*dreturn*/, 0/*areturn*/, 0/*return*/, UNPREDICTABLE/*getstatic*/, 0/*putstatic*/, - UNPREDICTABLE/*getfield*/, 0/*putfield*/, UNPREDICTABLE/*invokevirtual*/, - UNPREDICTABLE/*invokespecial*/, UNPREDICTABLE/*invokestatic*/, - UNPREDICTABLE/*invokeinterface*/, UNPREDICTABLE/*invokedynamic*/, 1/*new*/, 1/*newarray*/, 1/*anewarray*/, - 1/*arraylength*/, 1/*athrow*/, 1/*checkcast*/, 1/*instanceof*/, 0/*monitorenter*/, - 0/*monitorexit*/, 0/*wide*/, 1/*multianewarray*/, 0/*ifnull*/, 0/*ifnonnull*/, - 0/*goto_w*/, 1/*jsr_w*/, 0/*breakpoint*/, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, - UNDEFINED, UNPREDICTABLE/*impdep1*/, UNPREDICTABLE/*impdep2*/ - }; - - /** Attributes and their corresponding names. - */ - byte ATTR_UNKNOWN = -1; - byte ATTR_SOURCE_FILE = 0; - byte ATTR_CONSTANT_VALUE = 1; - byte ATTR_CODE = 2; - byte ATTR_EXCEPTIONS = 3; - byte ATTR_LINE_NUMBER_TABLE = 4; - byte ATTR_LOCAL_VARIABLE_TABLE = 5; - byte ATTR_INNER_CLASSES = 6; - byte ATTR_SYNTHETIC = 7; - byte ATTR_DEPRECATED = 8; - byte ATTR_PMG = 9; - byte ATTR_SIGNATURE = 10; - byte ATTR_STACK_MAP = 11; - byte ATTR_RUNTIMEVISIBLE_ANNOTATIONS = 12; - byte ATTR_RUNTIMEINVISIBLE_ANNOTATIONS = 13; - byte ATTR_RUNTIMEVISIBLE_PARAMETER_ANNOTATIONS = 14; - byte ATTR_RUNTIMEINVISIBLE_PARAMETER_ANNOTATIONS = 15; - byte ATTR_ANNOTATION_DEFAULT = 16; - - short KNOWN_ATTRIBUTES = 12;//should be 17 - - - // TODO: mutable public array!! - String[] ATTRIBUTE_NAMES = { - "SourceFile", "ConstantValue", "Code", "Exceptions", - "LineNumberTable", "LocalVariableTable", - "InnerClasses", "Synthetic", "Deprecated", - "PMGClass", "Signature", "StackMap", - "RuntimeVisibleAnnotations", "RuntimeInvisibleAnnotations", - "RuntimeVisibleParameterAnnotations", "RuntimeInvisibleParameterAnnotations", - "AnnotationDefault" - }; - - /** Constants used in the StackMap attribute. - */ - byte ITEM_Bogus = 0; - byte ITEM_Integer = 1; - byte ITEM_Float = 2; - byte ITEM_Double = 3; - byte ITEM_Long = 4; - byte ITEM_Null = 5; - byte ITEM_InitObject = 6; - byte ITEM_Object = 7; - byte ITEM_NewObject = 8; - - String[] ITEM_NAMES = { - "Bogus", "Integer", "Float", "Double", "Long", - "Null", "InitObject", "Object", "NewObject" - }; - -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/ExceptionConst.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/ExceptionConst.java deleted file mode 100644 index ed2c4268..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/ExceptionConst.java +++ /dev/null @@ -1,135 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel; - -/** - * Exception constants. - * @since 6.0 (intended to replace the InstructionConstant interface) - */ -public final class ExceptionConst { - - /** - * The mother of all exceptions - */ - public static final Class THROWABLE = Throwable.class; - - /** - * Super class of any run-time exception - */ - public static final Class RUNTIME_EXCEPTION = RuntimeException.class; - - /** - * Super class of any linking exception (aka Linkage Error) - */ - public static final Class LINKING_EXCEPTION = LinkageError.class; - - /** - * Linking Exceptions - */ - public static final Class CLASS_CIRCULARITY_ERROR = ClassCircularityError.class; - public static final Class CLASS_FORMAT_ERROR = ClassFormatError.class; - public static final Class EXCEPTION_IN_INITIALIZER_ERROR = ExceptionInInitializerError.class; - public static final Class INCOMPATIBLE_CLASS_CHANGE_ERROR = IncompatibleClassChangeError.class; - public static final Class ABSTRACT_METHOD_ERROR = AbstractMethodError.class; - public static final Class ILLEGAL_ACCESS_ERROR = IllegalAccessError.class; - public static final Class INSTANTIATION_ERROR = InstantiationError.class; - public static final Class NO_SUCH_FIELD_ERROR = NoSuchFieldError.class; - public static final Class NO_SUCH_METHOD_ERROR = NoSuchMethodError.class; - public static final Class NO_CLASS_DEF_FOUND_ERROR = NoClassDefFoundError.class; - public static final Class UNSATISFIED_LINK_ERROR = UnsatisfiedLinkError.class; - public static final Class VERIFY_ERROR = VerifyError.class; - /* UnsupportedClassVersionError is new in JDK 1.2 */ -// public static final Class UnsupportedClassVersionError = UnsupportedClassVersionError.class; - - /** - * Run-Time Exceptions - */ - public static final Class NULL_POINTER_EXCEPTION = NullPointerException.class; - public static final Class ARRAY_INDEX_OUT_OF_BOUNDS_EXCEPTION - = ArrayIndexOutOfBoundsException.class; - public static final Class ARITHMETIC_EXCEPTION = ArithmeticException.class; - public static final Class NEGATIVE_ARRAY_SIZE_EXCEPTION = NegativeArraySizeException.class; - public static final Class CLASS_CAST_EXCEPTION = ClassCastException.class; - public static final Class ILLEGAL_MONITOR_STATE = IllegalMonitorStateException.class; - - /** - * Pre-defined exception arrays according to chapters 5.1-5.4 of the Java Virtual - * Machine Specification - */ - private static final Class[] EXCS_CLASS_AND_INTERFACE_RESOLUTION = { - NO_CLASS_DEF_FOUND_ERROR, CLASS_FORMAT_ERROR, VERIFY_ERROR, ABSTRACT_METHOD_ERROR, - EXCEPTION_IN_INITIALIZER_ERROR, ILLEGAL_ACCESS_ERROR - }; // Chapter 5.1 - private static final Class[] EXCS_FIELD_AND_METHOD_RESOLUTION = { - NO_SUCH_FIELD_ERROR, ILLEGAL_ACCESS_ERROR, NO_SUCH_METHOD_ERROR - }; // Chapter 5.2 - private static final Class[] EXCS_INTERFACE_METHOD_RESOLUTION = new Class[0]; // Chapter 5.3 (as below) - private static final Class[] EXCS_STRING_RESOLUTION = new Class[0]; - // Chapter 5.4 (no errors but the ones that _always_ could happen! How stupid.) - private static final Class[] EXCS_ARRAY_EXCEPTION = { - NULL_POINTER_EXCEPTION, ARRAY_INDEX_OUT_OF_BOUNDS_EXCEPTION - }; - - /** - * Enum corresponding to the various Exception Class arrays, - * used by {@link ExceptionConst#createExceptions(EXCS, Class...)} - */ - public enum EXCS { - EXCS_CLASS_AND_INTERFACE_RESOLUTION, - EXCS_FIELD_AND_METHOD_RESOLUTION, - EXCS_INTERFACE_METHOD_RESOLUTION, - EXCS_STRING_RESOLUTION, - EXCS_ARRAY_EXCEPTION, - } - - // helper method to merge exception class arrays - private static Class[] mergeExceptions(final Class[] input, final Class ... extraClasses) { - final int extraLen = extraClasses == null ? 0 : extraClasses.length; - final Class[] excs = new Class[input.length + extraLen]; - System.arraycopy(input, 0, excs, 0, input.length); - if (extraLen > 0) { - System.arraycopy(extraClasses, 0, excs, input.length, extraLen); - } - return excs; - } - - /** - * Creates a copy of the specified Exception Class array combined with any additional Exception classes. - * @param type the basic array type - * @param extraClasses additional classes, if any - * @return the merged array - */ - public static Class[] createExceptions(final EXCS type, final Class ... extraClasses) { - switch (type) { - case EXCS_CLASS_AND_INTERFACE_RESOLUTION: - return mergeExceptions(EXCS_CLASS_AND_INTERFACE_RESOLUTION, extraClasses); - case EXCS_ARRAY_EXCEPTION: - return mergeExceptions(EXCS_ARRAY_EXCEPTION, extraClasses); - case EXCS_FIELD_AND_METHOD_RESOLUTION: - return mergeExceptions(EXCS_FIELD_AND_METHOD_RESOLUTION, extraClasses); - case EXCS_INTERFACE_METHOD_RESOLUTION: - return mergeExceptions(EXCS_INTERFACE_METHOD_RESOLUTION, extraClasses); - case EXCS_STRING_RESOLUTION: - return mergeExceptions(EXCS_STRING_RESOLUTION, extraClasses); - default: - throw new AssertionError("Cannot happen; unexpected enum value: " + type); - } - } - - -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/ExceptionConstants.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/ExceptionConstants.java deleted file mode 100644 index ea0e1ce6..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/ExceptionConstants.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel; - -/** - * Exception constants. - * - * @deprecated (since 6.0) DO NOT USE - use ExceptionConst instead - */ -@Deprecated -public interface ExceptionConstants { - - /** The mother of all exceptions - */ - Class THROWABLE = Throwable.class; - /** Super class of any run-time exception - */ - Class RUNTIME_EXCEPTION = RuntimeException.class; - /** Super class of any linking exception (aka Linkage Error) - */ - Class LINKING_EXCEPTION = LinkageError.class; - /** Linking Exceptions - */ - Class CLASS_CIRCULARITY_ERROR = ClassCircularityError.class; - Class CLASS_FORMAT_ERROR = ClassFormatError.class; - Class EXCEPTION_IN_INITIALIZER_ERROR = ExceptionInInitializerError.class; - Class INCOMPATIBLE_CLASS_CHANGE_ERROR = IncompatibleClassChangeError.class; - Class ABSTRACT_METHOD_ERROR = AbstractMethodError.class; - Class ILLEGAL_ACCESS_ERROR = IllegalAccessError.class; - Class INSTANTIATION_ERROR = InstantiationError.class; - Class NO_SUCH_FIELD_ERROR = NoSuchFieldError.class; - Class NO_SUCH_METHOD_ERROR = NoSuchMethodError.class; - Class NO_CLASS_DEF_FOUND_ERROR = NoClassDefFoundError.class; - Class UNSATISFIED_LINK_ERROR = UnsatisfiedLinkError.class; - Class VERIFY_ERROR = VerifyError.class; - /* UnsupportedClassVersionError is new in JDK 1.2 */ -// Class UnsupportedClassVersionError = UnsupportedClassVersionError.class; - /** Run-Time Exceptions - */ - Class NULL_POINTER_EXCEPTION = NullPointerException.class; - Class ARRAY_INDEX_OUT_OF_BOUNDS_EXCEPTION - = ArrayIndexOutOfBoundsException.class; - Class ARITHMETIC_EXCEPTION = ArithmeticException.class; - Class NEGATIVE_ARRAY_SIZE_EXCEPTION = NegativeArraySizeException.class; - Class CLASS_CAST_EXCEPTION = ClassCastException.class; - Class ILLEGAL_MONITOR_STATE = IllegalMonitorStateException.class; - - /** - * Pre-defined exception arrays according to chapters 5.1-5.4 of the Java Virtual - * Machine Specification - * @deprecated Do not use these arrays, use the static methods in the ExceptionConst implementation class instead - */ - @Deprecated - Class[] EXCS_CLASS_AND_INTERFACE_RESOLUTION = { - NO_CLASS_DEF_FOUND_ERROR, CLASS_FORMAT_ERROR, VERIFY_ERROR, ABSTRACT_METHOD_ERROR, - EXCEPTION_IN_INITIALIZER_ERROR, ILLEGAL_ACCESS_ERROR - }; // Chapter 5.1 - @Deprecated - Class[] EXCS_FIELD_AND_METHOD_RESOLUTION = { - NO_SUCH_FIELD_ERROR, ILLEGAL_ACCESS_ERROR, NO_SUCH_METHOD_ERROR - }; // Chapter 5.2 - @Deprecated - Class[] EXCS_INTERFACE_METHOD_RESOLUTION = new Class[0]; // Chapter 5.3 (as below) - @Deprecated - Class[] EXCS_STRING_RESOLUTION = new Class[0]; - // Chapter 5.4 (no errors but the ones that _always_ could happen! How stupid.) - @Deprecated - Class[] EXCS_ARRAY_EXCEPTION = { - NULL_POINTER_EXCEPTION, ARRAY_INDEX_OUT_OF_BOUNDS_EXCEPTION - }; - -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/Repository.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/Repository.java deleted file mode 100644 index edcccb4a..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/Repository.java +++ /dev/null @@ -1,266 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel; - -import java.io.IOException; - -import org.apache.bcel.classfile.JavaClass; -import org.apache.bcel.util.ClassPath; -import org.apache.bcel.util.SyntheticRepository; - -/** - * The repository maintains informations about class interdependencies, e.g., - * whether a class is a sub-class of another. Delegates actual class loading - * to SyntheticRepository with current class path by default. - * - * @see org.apache.bcel.util.Repository - * @see SyntheticRepository - * - */ -public abstract class Repository { - - private static org.apache.bcel.util.Repository repository = SyntheticRepository.getInstance(); - - - /** - * @return currently used repository instance - */ - public static org.apache.bcel.util.Repository getRepository() { - return repository; - } - - - /** - * Sets repository instance to be used for class loading - */ - public static void setRepository( final org.apache.bcel.util.Repository rep ) { - repository = rep; - } - - - /** - * Lookups class somewhere found on your CLASSPATH, or whereever the - * repository instance looks for it. - * - * @return class object for given fully qualified class name - * @throws ClassNotFoundException if the class could not be found or - * parsed correctly - */ - public static JavaClass lookupClass( final String class_name ) throws ClassNotFoundException { - return repository.loadClass(class_name); - } - - - /** - * Tries to find class source using the internal repository instance. - * - * @see Class - * @return JavaClass object for given runtime class - * @throws ClassNotFoundException if the class could not be found or - * parsed correctly - */ - public static JavaClass lookupClass( final Class clazz ) throws ClassNotFoundException { - return repository.loadClass(clazz); - } - - - /** - * @return class file object for given Java class by looking on the - * system class path; returns null if the class file can't be - * found - */ - public static ClassPath.ClassFile lookupClassFile( final String class_name ) { - try { - final ClassPath path = repository.getClassPath(); - if (path == null) { - return null; - } - return path.getClassFile(class_name); - } catch (final IOException e) { - return null; - } - } - - - /** - * Clears the repository. - */ - public static void clearCache() { - repository.clear(); - } - - - /** - * Adds clazz to repository if there isn't an equally named class already in there. - * - * @return old entry in repository - */ - public static JavaClass addClass( final JavaClass clazz ) { - final JavaClass old = repository.findClass(clazz.getClassName()); - repository.storeClass(clazz); - return old; - } - - - /** - * Removes class with given (fully qualified) name from repository. - */ - public static void removeClass( final String clazz ) { - repository.removeClass(repository.findClass(clazz)); - } - - - /** - * Removes given class from repository. - */ - public static void removeClass( final JavaClass clazz ) { - repository.removeClass(clazz); - } - - - /** - * @return list of super classes of clazz in ascending order, i.e., - * Object is always the last element - * @throws ClassNotFoundException if any of the superclasses can't be found - */ - public static JavaClass[] getSuperClasses( final JavaClass clazz ) throws ClassNotFoundException { - return clazz.getSuperClasses(); - } - - - /** - * @return list of super classes of clazz in ascending order, i.e., - * Object is always the last element. - * @throws ClassNotFoundException if the named class or any of its - * superclasses can't be found - */ - public static JavaClass[] getSuperClasses( final String class_name ) throws ClassNotFoundException { - final JavaClass jc = lookupClass(class_name); - return getSuperClasses(jc); - } - - - /** - * @return all interfaces implemented by class and its super - * classes and the interfaces that those interfaces extend, and so on. - * (Some people call this a transitive hull). - * @throws ClassNotFoundException if any of the class's - * superclasses or superinterfaces can't be found - */ - public static JavaClass[] getInterfaces( final JavaClass clazz ) throws ClassNotFoundException { - return clazz.getAllInterfaces(); - } - - - /** - * @return all interfaces implemented by class and its super - * classes and the interfaces that extend those interfaces, and so on - * @throws ClassNotFoundException if the named class can't be found, - * or if any of its superclasses or superinterfaces can't be found - */ - public static JavaClass[] getInterfaces( final String class_name ) throws ClassNotFoundException { - return getInterfaces(lookupClass(class_name)); - } - - - /** - * Equivalent to runtime "instanceof" operator. - * @return true, if clazz is an instance of super_class - * @throws ClassNotFoundException if any superclasses or superinterfaces - * of clazz can't be found - */ - public static boolean instanceOf( final JavaClass clazz, final JavaClass super_class ) - throws ClassNotFoundException { - return clazz.instanceOf(super_class); - } - - - /** - * @return true, if clazz is an instance of super_class - * @throws ClassNotFoundException if either clazz or super_class - * can't be found - */ - public static boolean instanceOf( final String clazz, final String super_class ) - throws ClassNotFoundException { - return instanceOf(lookupClass(clazz), lookupClass(super_class)); - } - - - /** - * @return true, if clazz is an instance of super_class - * @throws ClassNotFoundException if super_class can't be found - */ - public static boolean instanceOf( final JavaClass clazz, final String super_class ) - throws ClassNotFoundException { - return instanceOf(clazz, lookupClass(super_class)); - } - - - /** - * @return true, if clazz is an instance of super_class - * @throws ClassNotFoundException if clazz can't be found - */ - public static boolean instanceOf( final String clazz, final JavaClass super_class ) - throws ClassNotFoundException { - return instanceOf(lookupClass(clazz), super_class); - } - - - /** - * @return true, if clazz is an implementation of interface inter - * @throws ClassNotFoundException if any superclasses or superinterfaces - * of clazz can't be found - */ - public static boolean implementationOf( final JavaClass clazz, final JavaClass inter ) - throws ClassNotFoundException { - return clazz.implementationOf(inter); - } - - - /** - * @return true, if clazz is an implementation of interface inter - * @throws ClassNotFoundException if clazz, inter, or any superclasses - * or superinterfaces of clazz can't be found - */ - public static boolean implementationOf( final String clazz, final String inter ) - throws ClassNotFoundException { - return implementationOf(lookupClass(clazz), lookupClass(inter)); - } - - - /** - * @return true, if clazz is an implementation of interface inter - * @throws ClassNotFoundException if inter or any superclasses - * or superinterfaces of clazz can't be found - */ - public static boolean implementationOf( final JavaClass clazz, final String inter ) - throws ClassNotFoundException { - return implementationOf(clazz, lookupClass(inter)); - } - - - /** - * @return true, if clazz is an implementation of interface inter - * @throws ClassNotFoundException if clazz or any superclasses or - * superinterfaces of clazz can't be found - */ - public static boolean implementationOf( final String clazz, final JavaClass inter ) - throws ClassNotFoundException { - return implementationOf(lookupClass(clazz), inter); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/AccessFlags.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/AccessFlags.java deleted file mode 100644 index 2d03a763..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/AccessFlags.java +++ /dev/null @@ -1,218 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import org.apache.bcel.Const; - -/** - * Super class for all objects that have modifiers like private, final, ... I.e. classes, fields, and methods. - * - */ -public abstract class AccessFlags { - - /** - * @deprecated (since 6.0) will be made private; do not access directly, use getter/setter - */ - @java.lang.Deprecated - protected int access_flags; // TODO not used externally at present - - public AccessFlags() { - } - - /** - * @param a - * inital access flags - */ - public AccessFlags(final int a) { - access_flags = a; - } - - /** - * @return Access flags of the object aka. "modifiers". - */ - public final int getAccessFlags() { - return access_flags; - } - - /** - * @return Access flags of the object aka. "modifiers". - */ - public final int getModifiers() { - return access_flags; - } - - /** - * Set access flags aka "modifiers". - * - * @param access_flags - * Access flags of the object. - */ - public final void setAccessFlags(final int access_flags) { - this.access_flags = access_flags; - } - - /** - * Set access flags aka "modifiers". - * - * @param access_flags - * Access flags of the object. - */ - public final void setModifiers(final int access_flags) { - setAccessFlags(access_flags); - } - - private void setFlag(final int flag, final boolean set) { - if ((access_flags & flag) != 0) { // Flag is set already - if (!set) { - access_flags ^= flag; - } - } else { // Flag not set - if (set) { - access_flags |= flag; - } - } - } - - public final void isPublic(final boolean flag) { - setFlag(Const.ACC_PUBLIC, flag); - } - - public final boolean isPublic() { - return (access_flags & Const.ACC_PUBLIC) != 0; - } - - public final void isPrivate(final boolean flag) { - setFlag(Const.ACC_PRIVATE, flag); - } - - public final boolean isPrivate() { - return (access_flags & Const.ACC_PRIVATE) != 0; - } - - public final void isProtected(final boolean flag) { - setFlag(Const.ACC_PROTECTED, flag); - } - - public final boolean isProtected() { - return (access_flags & Const.ACC_PROTECTED) != 0; - } - - public final void isStatic(final boolean flag) { - setFlag(Const.ACC_STATIC, flag); - } - - public final boolean isStatic() { - return (access_flags & Const.ACC_STATIC) != 0; - } - - public final void isFinal(final boolean flag) { - setFlag(Const.ACC_FINAL, flag); - } - - public final boolean isFinal() { - return (access_flags & Const.ACC_FINAL) != 0; - } - - public final void isSynchronized(final boolean flag) { - setFlag(Const.ACC_SYNCHRONIZED, flag); - } - - public final boolean isSynchronized() { - return (access_flags & Const.ACC_SYNCHRONIZED) != 0; - } - - public final void isVolatile(final boolean flag) { - setFlag(Const.ACC_VOLATILE, flag); - } - - public final boolean isVolatile() { - return (access_flags & Const.ACC_VOLATILE) != 0; - } - - public final void isTransient(final boolean flag) { - setFlag(Const.ACC_TRANSIENT, flag); - } - - public final boolean isTransient() { - return (access_flags & Const.ACC_TRANSIENT) != 0; - } - - public final void isNative(final boolean flag) { - setFlag(Const.ACC_NATIVE, flag); - } - - public final boolean isNative() { - return (access_flags & Const.ACC_NATIVE) != 0; - } - - public final void isInterface(final boolean flag) { - setFlag(Const.ACC_INTERFACE, flag); - } - - public final boolean isInterface() { - return (access_flags & Const.ACC_INTERFACE) != 0; - } - - public final void isAbstract(final boolean flag) { - setFlag(Const.ACC_ABSTRACT, flag); - } - - public final boolean isAbstract() { - return (access_flags & Const.ACC_ABSTRACT) != 0; - } - - public final void isStrictfp(final boolean flag) { - setFlag(Const.ACC_STRICT, flag); - } - - public final boolean isStrictfp() { - return (access_flags & Const.ACC_STRICT) != 0; - } - - public final void isSynthetic(final boolean flag) { - setFlag(Const.ACC_SYNTHETIC, flag); - } - - public final boolean isSynthetic() { - return (access_flags & Const.ACC_SYNTHETIC) != 0; - } - - public final void isAnnotation(final boolean flag) { - setFlag(Const.ACC_ANNOTATION, flag); - } - - public final boolean isAnnotation() { - return (access_flags & Const.ACC_ANNOTATION) != 0; - } - - public final void isEnum(final boolean flag) { - setFlag(Const.ACC_ENUM, flag); - } - - public final boolean isEnum() { - return (access_flags & Const.ACC_ENUM) != 0; - } - - public final void isVarArgs(final boolean flag) { - setFlag(Const.ACC_VARARGS, flag); - } - - public final boolean isVarArgs() { - return (access_flags & Const.ACC_VARARGS) != 0; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/AnnotationDefault.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/AnnotationDefault.java deleted file mode 100644 index c0efe4c2..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/AnnotationDefault.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * Represents the default value of a annotation for a method info - * - * @since 6.0 - */ -public class AnnotationDefault extends Attribute { - - private ElementValue defaultValue; - - /** - * @param name_index Index pointing to the name Code - * @param length Content length in bytes - * @param input Input stream - * @param constant_pool Array of constants - */ - AnnotationDefault(final int name_index, final int length, final DataInput input, final ConstantPool constant_pool) throws IOException { - this(name_index, length, (ElementValue) null, constant_pool); - defaultValue = ElementValue.readElementValue(input, constant_pool); - } - - /** - * @param name_index Index pointing to the name Code - * @param length Content length in bytes - * @param defaultValue the annotation's default value - * @param constant_pool Array of constants - */ - public AnnotationDefault(final int name_index, final int length, final ElementValue defaultValue, final ConstantPool constant_pool) { - super(Const.ATTR_ANNOTATION_DEFAULT, name_index, length, constant_pool); - this.defaultValue = defaultValue; - } - - /** - * Called by objects that are traversing the nodes of the tree implicitely - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept(final Visitor v) { - v.visitAnnotationDefault(this); - } - - /** - * @param defaultValue the default value of this methodinfo's annotation - */ - public final void setDefaultValue(final ElementValue defaultValue) { - this.defaultValue = defaultValue; - } - - /** - * @return the default value - */ - public final ElementValue getDefaultValue() { - return defaultValue; - } - - @Override - public Attribute copy(final ConstantPool _constant_pool) { - return (Attribute) clone(); - } - - @Override - public final void dump(final DataOutputStream dos) throws IOException { - super.dump(dos); - defaultValue.dump(dos); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/AnnotationElementValue.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/AnnotationElementValue.java deleted file mode 100644 index 86e68ea1..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/AnnotationElementValue.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataOutputStream; -import java.io.IOException; - -/** - * @since 6.0 - */ -public class AnnotationElementValue extends ElementValue -{ - // For annotation element values, this is the annotation - private final AnnotationEntry annotationEntry; - - public AnnotationElementValue(final int type, final AnnotationEntry annotationEntry, - final ConstantPool cpool) - { - super(type, cpool); - if (type != ANNOTATION) { - throw new IllegalArgumentException( - "Only element values of type annotation can be built with this ctor - type specified: " + type); - } - this.annotationEntry = annotationEntry; - } - - @Override - public void dump(final DataOutputStream dos) throws IOException - { - dos.writeByte(super.getType()); // u1 type of value (ANNOTATION == '@') - annotationEntry.dump(dos); - } - - @Override - public String stringifyValue() - { - return annotationEntry.toString(); - } - - @Override - public String toString() - { - return stringifyValue(); - } - - public AnnotationEntry getAnnotationEntry() - { - return annotationEntry; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/AnnotationEntry.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/AnnotationEntry.java deleted file mode 100644 index 6540e2d0..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/AnnotationEntry.java +++ /dev/null @@ -1,167 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.apache.bcel.Const; - -/** - * represents one annotation in the annotation table - * - * @since 6.0 - */ -public class AnnotationEntry implements Node { - - private final int typeIndex; - private final ConstantPool constantPool; - private final boolean isRuntimeVisible; - - private List elementValuePairs; - - /* - * Factory method to create an AnnotionEntry from a DataInput - * - * @param input - * @param constantPool - * @param isRuntimeVisible - * @return the entry - * @throws IOException - */ - public static AnnotationEntry read(final DataInput input, final ConstantPool constant_pool, final boolean isRuntimeVisible) throws IOException { - - final AnnotationEntry annotationEntry = new AnnotationEntry(input.readUnsignedShort(), constant_pool, isRuntimeVisible); - final int num_element_value_pairs = input.readUnsignedShort(); - annotationEntry.elementValuePairs = new ArrayList<>(); - for (int i = 0; i < num_element_value_pairs; i++) { - annotationEntry.elementValuePairs.add( - new ElementValuePair(input.readUnsignedShort(), ElementValue.readElementValue(input, constant_pool), - constant_pool)); - } - return annotationEntry; - } - - public AnnotationEntry(final int type_index, final ConstantPool constant_pool, final boolean isRuntimeVisible) { - this.typeIndex = type_index; - this.constantPool = constant_pool; - this.isRuntimeVisible = isRuntimeVisible; - } - - public int getTypeIndex() { - return typeIndex; - } - - public ConstantPool getConstantPool() { - return constantPool; - } - - public boolean isRuntimeVisible() { - return isRuntimeVisible; - } - - /** - * Called by objects that are traversing the nodes of the tree implicitely defined by the contents of a Java class. - * I.e., the hierarchy of methods, fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept(final Visitor v) { - v.visitAnnotationEntry(this); - } - - /** - * @return the annotation type name - */ - public String getAnnotationType() { - final ConstantUtf8 c = (ConstantUtf8) constantPool.getConstant(typeIndex, Const.CONSTANT_Utf8); - return c.getBytes(); - } - - /** - * @return the annotation type index - */ - public int getAnnotationTypeIndex() { - return typeIndex; - } - - /** - * @return the number of element value pairs in this annotation entry - */ - public final int getNumElementValuePairs() { - return elementValuePairs.size(); - } - - /** - * @return the element value pairs in this annotation entry - */ - public ElementValuePair[] getElementValuePairs() { - // TODO return List - return elementValuePairs.toArray(new ElementValuePair[elementValuePairs.size()]); - } - - public void dump(final DataOutputStream dos) throws IOException { - dos.writeShort(typeIndex); // u2 index of type name in cpool - dos.writeShort(elementValuePairs.size()); // u2 element_value pair - // count - for (final ElementValuePair envp : elementValuePairs) { - envp.dump(dos); - } - } - - public void addElementNameValuePair(final ElementValuePair elementNameValuePair) { - elementValuePairs.add(elementNameValuePair); - } - - public String toShortString() { - final StringBuilder result = new StringBuilder(); - result.append("@"); - result.append(getAnnotationType()); - final ElementValuePair[] evPairs = getElementValuePairs(); - if (evPairs.length > 0) { - result.append("("); - for (final ElementValuePair element : evPairs) { - result.append(element.toShortString()); - } - result.append(")"); - } - return result.toString(); - } - - @Override - public String toString() { - return toShortString(); - } - - public static AnnotationEntry[] createAnnotationEntries(final Attribute[] attrs) { - // Find attributes that contain annotation data - final List accumulatedAnnotations = new ArrayList<>(attrs.length); - for (final Attribute attribute : attrs) { - if (attribute instanceof Annotations) { - final Annotations runtimeAnnotations = (Annotations) attribute; - Collections.addAll(accumulatedAnnotations, runtimeAnnotations.getAnnotationEntries()); - } - } - return accumulatedAnnotations.toArray(new AnnotationEntry[accumulatedAnnotations.size()]); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/Annotations.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/Annotations.java deleted file mode 100644 index 584cc5fa..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/Annotations.java +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -/** - * base class for annotations - * - * @since 6.0 - */ -public abstract class Annotations extends Attribute { - - private AnnotationEntry[] annotationTable; - private final boolean isRuntimeVisible; - - /** - * @param annotation_type the subclass type of the annotation - * @param name_index Index pointing to the name Code - * @param length Content length in bytes - * @param input Input stream - * @param constant_pool Array of constants - */ - Annotations(final byte annotation_type, final int name_index, final int length, final DataInput input, - final ConstantPool constant_pool, final boolean isRuntimeVisible) throws IOException { - this(annotation_type, name_index, length, (AnnotationEntry[]) null, constant_pool, isRuntimeVisible); - final int annotation_table_length = input.readUnsignedShort(); - annotationTable = new AnnotationEntry[annotation_table_length]; - for (int i = 0; i < annotation_table_length; i++) { - annotationTable[i] = AnnotationEntry.read(input, constant_pool, isRuntimeVisible); - } - } - - /** - * @param annotationType the subclass type of the annotation - * @param nameIndex Index pointing to the name Code - * @param length Content length in bytes - * @param annotationTable the actual annotations - * @param constantPool Array of constants - */ - public Annotations(final byte annotationType, final int nameIndex, final int length, final AnnotationEntry[] annotationTable, - final ConstantPool constantPool, final boolean isRuntimeVisible) { - super(annotationType, nameIndex, length, constantPool); - this.annotationTable = annotationTable; - this.isRuntimeVisible = isRuntimeVisible; - } - - /** - * Called by objects that are traversing the nodes of the tree implicitely defined by the contents of a Java class. - * I.e., the hierarchy of methods, fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept(final Visitor v) { - v.visitAnnotation(this); - } - - /** - * @param annotationTable the entries to set in this annotation - */ - public final void setAnnotationTable(final AnnotationEntry[] annotationTable) { - this.annotationTable = annotationTable; - } - - /** - * returns the array of annotation entries in this annotation - */ - public AnnotationEntry[] getAnnotationEntries() { - return annotationTable; - } - - /** - * @return the number of annotation entries in this annotation - */ - public final int getNumAnnotations() { - if (annotationTable == null) { - return 0; - } - return annotationTable.length; - } - - public boolean isRuntimeVisible() { - return isRuntimeVisible; - } - - protected void writeAnnotations(final DataOutputStream dos) throws IOException { - if (annotationTable == null) { - return; - } - dos.writeShort(annotationTable.length); - for (final AnnotationEntry element : annotationTable) { - element.dump(dos); - } - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ArrayElementValue.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ArrayElementValue.java deleted file mode 100644 index 734a904d..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ArrayElementValue.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataOutputStream; -import java.io.IOException; - -/** - * @since 6.0 - */ -public class ArrayElementValue extends ElementValue -{ - // For array types, this is the array - private final ElementValue[] elementValues; - - @Override - public String toString() - { - final StringBuilder sb = new StringBuilder(); - sb.append("{"); - for (int i = 0; i < elementValues.length; i++) - { - sb.append(elementValues[i]); - if ((i + 1) < elementValues.length) { - sb.append(","); - } - } - sb.append("}"); - return sb.toString(); - } - - public ArrayElementValue(final int type, final ElementValue[] datums, final ConstantPool cpool) - { - super(type, cpool); - if (type != ARRAY) { - throw new IllegalArgumentException( - "Only element values of type array can be built with this ctor - type specified: " + type); - } - this.elementValues = datums; - } - - @Override - public void dump(final DataOutputStream dos) throws IOException - { - dos.writeByte(super.getType()); // u1 type of value (ARRAY == '[') - dos.writeShort(elementValues.length); - for (final ElementValue evalue : elementValues) { - evalue.dump(dos); - } - } - - @Override - public String stringifyValue() - { - final StringBuilder sb = new StringBuilder(); - sb.append("["); - for (int i = 0; i < elementValues.length; i++) - { - sb.append(elementValues[i].stringifyValue()); - if ((i + 1) < elementValues.length) { - sb.append(","); - } - } - sb.append("]"); - return sb.toString(); - } - - public ElementValue[] getElementValuesArray() - { - return elementValues; - } - - public int getElementValuesArraySize() - { - return elementValues.length; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/Attribute.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/Attribute.java deleted file mode 100644 index 72e5c4e8..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/Attribute.java +++ /dev/null @@ -1,389 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; - -import org.apache.bcel.Const; - -/** - * Abstract super class for Attribute objects. Currently the - * ConstantValue, SourceFile, Code, - * Exceptiontable, LineNumberTable, - * LocalVariableTable, InnerClasses and - * Synthetic attributes are supported. The Unknown - * attribute stands for non-standard-attributes. - * - * @see ConstantValue - * @see SourceFile - * @see Code - * @see Unknown - * @see ExceptionTable - * @see LineNumberTable - * @see LocalVariableTable - * @see InnerClasses - * @see Synthetic - * @see Deprecated - * @see Signature - */ -public abstract class Attribute implements Cloneable, Node { - - private static final boolean debug = Boolean.getBoolean(Attribute.class.getCanonicalName() + ".debug"); // Debugging on/off - - private static final Map readers = new HashMap<>(); - - /** - * Add an Attribute reader capable of parsing (user-defined) attributes - * named "name". You should not add readers for the standard attributes such - * as "LineNumberTable", because those are handled internally. - * - * @param name the name of the attribute as stored in the class file - * @param r the reader object - * @deprecated (6.0) Use {@link #addAttributeReader(String, UnknownAttributeReader)} instead - */ - @java.lang.Deprecated - public static void addAttributeReader(final String name, final AttributeReader r) - { - readers.put(name, r); - } - - /** - * Add an Attribute reader capable of parsing (user-defined) attributes - * named "name". You should not add readers for the standard attributes such - * as "LineNumberTable", because those are handled internally. - * - * @param name the name of the attribute as stored in the class file - * @param r the reader object - */ - public static void addAttributeReader(final String name, final UnknownAttributeReader r) - { - readers.put(name, r); - } - - protected static void println(final String msg) { - if (debug) { - System.err.println(msg); - } - } - - /** - * Class method reads one attribute from the input data stream. This method - * must not be accessible from the outside. It is called by the Field and - * Method constructor methods. - * - * @see Field - * @see Method - * - * @param file Input stream - * @param constant_pool Array of constants - * @return Attribute - * @throws IOException - * @throws ClassFormatException - * @since 6.0 - */ - public static Attribute readAttribute(final DataInput file, final ConstantPool constant_pool) - throws IOException, ClassFormatException - { - byte tag = Const.ATTR_UNKNOWN; // Unknown attribute - // Get class name from constant pool via `name_index' indirection - final int name_index = file.readUnsignedShort(); - final ConstantUtf8 c = (ConstantUtf8) constant_pool.getConstant(name_index, Const.CONSTANT_Utf8); - final String name = c.getBytes(); - - // Length of data in bytes - final int length = file.readInt(); - - // Compare strings to find known attribute - for (byte i = 0; i < Const.KNOWN_ATTRIBUTES; i++) - { - if (name.equals(Const.getAttributeName(i))) - { - tag = i; // found! - break; - } - } - - // Call proper constructor, depending on `tag' - switch (tag) - { - case Const.ATTR_UNKNOWN: - final Object r = readers.get(name); - if (r instanceof UnknownAttributeReader) - { - return ((UnknownAttributeReader) r).createAttribute(name_index, length, file, constant_pool); - } - return new Unknown(name_index, length, file, constant_pool); - case Const.ATTR_CONSTANT_VALUE: - return new ConstantValue(name_index, length, file, constant_pool); - case Const.ATTR_SOURCE_FILE: - return new SourceFile(name_index, length, file, constant_pool); - case Const.ATTR_CODE: - return new Code(name_index, length, file, constant_pool); - case Const.ATTR_EXCEPTIONS: - return new ExceptionTable(name_index, length, file, constant_pool); - case Const.ATTR_LINE_NUMBER_TABLE: - return new LineNumberTable(name_index, length, file, constant_pool); - case Const.ATTR_LOCAL_VARIABLE_TABLE: - return new LocalVariableTable(name_index, length, file, constant_pool); - case Const.ATTR_INNER_CLASSES: - return new InnerClasses(name_index, length, file, constant_pool); - case Const.ATTR_SYNTHETIC: - return new Synthetic(name_index, length, file, constant_pool); - case Const.ATTR_DEPRECATED: - return new Deprecated(name_index, length, file, constant_pool); - case Const.ATTR_PMG: - return new PMGClass(name_index, length, file, constant_pool); - case Const.ATTR_SIGNATURE: - return new Signature(name_index, length, file, constant_pool); - case Const.ATTR_STACK_MAP: - // old style stack map: unneeded for JDK5 and below; - // illegal(?) for JDK6 and above. So just delete with a warning. - println("Warning: Obsolete StackMap attribute ignored."); - return new Unknown(name_index, length, file, constant_pool); - case Const.ATTR_RUNTIME_VISIBLE_ANNOTATIONS: - return new RuntimeVisibleAnnotations(name_index, length, file, constant_pool); - case Const.ATTR_RUNTIME_INVISIBLE_ANNOTATIONS: - return new RuntimeInvisibleAnnotations(name_index, length, file, constant_pool); - case Const.ATTR_RUNTIME_VISIBLE_PARAMETER_ANNOTATIONS: - return new RuntimeVisibleParameterAnnotations(name_index, length, file, constant_pool); - case Const.ATTR_RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS: - return new RuntimeInvisibleParameterAnnotations(name_index, length, file, constant_pool); - case Const.ATTR_ANNOTATION_DEFAULT: - return new AnnotationDefault(name_index, length, file, constant_pool); - case Const.ATTR_LOCAL_VARIABLE_TYPE_TABLE: - return new LocalVariableTypeTable(name_index, length, file, constant_pool); - case Const.ATTR_ENCLOSING_METHOD: - return new EnclosingMethod(name_index, length, file, constant_pool); - case Const.ATTR_STACK_MAP_TABLE: - // read new style stack map: StackMapTable. The rest of the code - // calls this a StackMap for historical reasons. - return new StackMap(name_index, length, file, constant_pool); - case Const.ATTR_BOOTSTRAP_METHODS: - return new BootstrapMethods(name_index, length, file, constant_pool); - case Const.ATTR_METHOD_PARAMETERS: - return new MethodParameters(name_index, length, file, constant_pool); - case Const.ATTR_MODULE: - return new Module(name_index, length, file, constant_pool); - case Const.ATTR_MODULE_PACKAGES: - return new ModulePackages(name_index, length, file, constant_pool); - case Const.ATTR_MODULE_MAIN_CLASS: - return new ModuleMainClass(name_index, length, file, constant_pool); - case Const.ATTR_NEST_HOST: - return new NestHost(name_index, length, file, constant_pool); - case Const.ATTR_NEST_MEMBERS: - return new NestMembers(name_index, length, file, constant_pool); - default: - // Never reached - throw new IllegalStateException("Unrecognized attribute type tag parsed: " + tag); - } - } - - /** - * Class method reads one attribute from the input data stream. This method - * must not be accessible from the outside. It is called by the Field and - * Method constructor methods. - * - * @see Field - * @see Method - * - * @param file Input stream - * @param constant_pool Array of constants - * @return Attribute - * @throws IOException - * @throws ClassFormatException - */ - public static Attribute readAttribute(final DataInputStream file, final ConstantPool constant_pool) - throws IOException, ClassFormatException - { - return readAttribute((DataInput) file, constant_pool); - } - - /** - * Remove attribute reader - * - * @param name the name of the attribute as stored in the class file - */ - public static void removeAttributeReader(final String name) - { - readers.remove(name); - } - - /** - * @deprecated (since 6.0) will be made private; do not access directly, use getter/setter - */ - @java.lang.Deprecated - protected int name_index; // Points to attribute name in constant pool TODO make private (has getter & setter) - - /** - * @deprecated (since 6.0) (since 6.0) will be made private; do not access directly, use getter/setter - */ - @java.lang.Deprecated - protected int length; // Content length of attribute field TODO make private (has getter & setter) - - /** - * @deprecated (since 6.0) will be made private; do not access directly, use getter/setter - */ - @java.lang.Deprecated - protected byte tag; // Tag to distinguish subclasses TODO make private & final; supposed to be immutable - - /** - * @deprecated (since 6.0) will be made private; do not access directly, use getter/setter - */ - @java.lang.Deprecated - protected ConstantPool constant_pool; // TODO make private (has getter & setter) - - protected Attribute(final byte tag, final int name_index, final int length, final ConstantPool constant_pool) - { - this.tag = tag; - this.name_index = name_index; - this.length = length; - this.constant_pool = constant_pool; - } - - /** - * Called by objects that are traversing the nodes of the tree implicitely - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v - * Visitor object - */ - @Override - public abstract void accept(Visitor v); - - /** - * Use copy() if you want to have a deep copy(), i.e., with all references - * copied correctly. - * - * @return shallow copy of this attribute - */ - @Override - public Object clone() - { - Attribute attr = null; - try - { - attr = (Attribute) super.clone(); - } - catch (final CloneNotSupportedException e) - { - throw new Error("Clone Not Supported"); // never happens - } - return attr; - } - - /** - * @return deep copy of this attribute - */ - public abstract Attribute copy(ConstantPool _constant_pool); - - /** - * Dump attribute to file stream in binary format. - * - * @param file - * Output file stream - * @throws IOException - */ - public void dump(final DataOutputStream file) throws IOException - { - file.writeShort(name_index); - file.writeInt(length); - } - - /** - * @return Constant pool used by this object. - * @see ConstantPool - */ - public final ConstantPool getConstantPool() - { - return constant_pool; - } - - /** - * @return Length of attribute field in bytes. - */ - public final int getLength() - { - return length; - } - - /** - * @return Name of attribute - * @since 6.0 - */ - public String getName() - { - final ConstantUtf8 c = (ConstantUtf8) constant_pool.getConstant(name_index, Const.CONSTANT_Utf8); - return c.getBytes(); - } - - /** - * @return Name index in constant pool of attribute name. - */ - public final int getNameIndex() - { - return name_index; - } - - /** - * @return Tag of attribute, i.e., its type. Value may not be altered, thus there is no setTag() method. - */ - public final byte getTag() - { - return tag; - } - - /** - * @param constant_pool Constant pool to be used for this object. - * @see ConstantPool - */ - public final void setConstantPool(final ConstantPool constant_pool) - { - this.constant_pool = constant_pool; - } - - /** - * @param length length in bytes. - */ - public final void setLength(final int length) - { - this.length = length; - } - - /** - * @param name_index of attribute. - */ - public final void setNameIndex(final int name_index) - { - this.name_index = name_index; - } - - /** - * @return attribute name. - */ - @Override - public String toString() - { - return Const.getAttributeName(tag); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/AttributeReader.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/AttributeReader.java deleted file mode 100644 index 4993aaa6..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/AttributeReader.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -/** - * Unknown (non-standard) attributes may be read via user-defined factory - * objects that can be registered with the Attribute.addAttributeReader - * method. These factory objects should implement this interface. - - * @see Attribute - * - * @deprecated Use UnknownAttributeReader instead - */ -@java.lang.Deprecated -public interface AttributeReader { - - /** - When this attribute reader is added via the static method - Attribute.addAttributeReader, an attribute name is associated with it. - As the class file parser parses attributes, it will call various - AttributeReaders based on the name of the attributes it is - constructing. - - @param name_index An index into the constant pool, indexing a - ConstantUtf8 that represents the name of the attribute. - - @param length The length of the data contained in the attribute. This - is written into the constant pool and should agree with what the - factory expects the length to be. - - @param file This is the data input stream that the factory needs to read - its data from. - - @param constant_pool This is the constant pool associated with the - Attribute that we are constructing. - - @return The user-defined AttributeReader should take this data and use - it to construct an attribute. In the case of errors, a null can be - returned which will cause the parsing of the class file to fail. - - @see Attribute#addAttributeReader( String, AttributeReader ) - */ - Attribute createAttribute( int name_index, int length, java.io.DataInputStream file, ConstantPool constant_pool ); -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/BootstrapMethod.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/BootstrapMethod.java deleted file mode 100644 index 0835a659..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/BootstrapMethod.java +++ /dev/null @@ -1,169 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; -import java.util.Arrays; - -import org.apache.bcel.Const; - -/** - * This class represents a bootstrap method attribute, i.e., the bootstrap - * method ref, the number of bootstrap arguments and an array of the - * bootstrap arguments. - * - * @see - * The class File Format : The BootstrapMethods Attribute - * @since 6.0 - */ -public class BootstrapMethod implements Cloneable { - - /** Index of the CONSTANT_MethodHandle_info structure in the constant_pool table */ - private int bootstrapMethodRef; - - /** Array of references to the constant_pool table */ - private int[] bootstrapArguments; - - - /** - * Initialize from another object. - */ - public BootstrapMethod(final BootstrapMethod c) { - this(c.getBootstrapMethodRef(), c.getBootstrapArguments()); - } - - /** - * Construct object from input stream. - * - * @param input Input stream - * @throws IOException - */ - BootstrapMethod(final DataInput input) throws IOException { - this(input.readUnsignedShort(), input.readUnsignedShort()); - - for (int i = 0; i < bootstrapArguments.length; i++) { - bootstrapArguments[i] = input.readUnsignedShort(); - } - } - - // helper method - private BootstrapMethod(final int bootstrap_method_ref, final int num_bootstrap_arguments) { - this(bootstrap_method_ref, new int[num_bootstrap_arguments]); - } - - /** - * @param bootstrapMethodRef int index into constant_pool of CONSTANT_MethodHandle - * @param bootstrapArguments int[] indices into constant_pool of CONSTANT_[type]_info - */ - public BootstrapMethod(final int bootstrapMethodRef, final int[] bootstrapArguments) { - this.bootstrapMethodRef = bootstrapMethodRef; - this.bootstrapArguments = bootstrapArguments; - } - - /** - * @return index into constant_pool of bootstrap_method - */ - public int getBootstrapMethodRef() { - return bootstrapMethodRef; - } - - /** - * @param bootstrapMethodRef int index into constant_pool of CONSTANT_MethodHandle - */ - public void setBootstrapMethodRef(final int bootstrapMethodRef) { - this.bootstrapMethodRef = bootstrapMethodRef; - } - - /** - * @return int[] of bootstrap_method indices into constant_pool of CONSTANT_[type]_info - */ - public int[] getBootstrapArguments() { - return bootstrapArguments; - } - - /** - * @return count of number of boostrap arguments - */ - public int getNumBootstrapArguments() { - return bootstrapArguments.length; - } - - /** - * @param bootstrapArguments int[] indices into constant_pool of CONSTANT_[type]_info - */ - public void setBootstrapArguments(final int[] bootstrapArguments) { - this.bootstrapArguments = bootstrapArguments; - } - - /** - * @return String representation. - */ - @Override - public final String toString() { - return "BootstrapMethod(" + bootstrapMethodRef + ", " + bootstrapArguments.length + ", " - + Arrays.toString(bootstrapArguments) + ")"; - } - - /** - * @return Resolved string representation - */ - public final String toString( final ConstantPool constantPool ) { - final StringBuilder buf = new StringBuilder(); - String bootstrap_method_name; - bootstrap_method_name = constantPool.constantToString(bootstrapMethodRef, - Const.CONSTANT_MethodHandle); - buf.append(Utility.compactClassName(bootstrap_method_name, false)); - final int num_bootstrap_arguments = bootstrapArguments.length; - if (num_bootstrap_arguments > 0) { - buf.append("\nMethod Arguments:"); - for (int i = 0; i < num_bootstrap_arguments; i++) { - buf.append("\n ").append(i).append(": "); - buf.append(constantPool.constantToString(constantPool.getConstant(bootstrapArguments[i]))); - } - } - return buf.toString(); - } - - /** - * Dump object to file stream in binary format. - * - * @param file Output file stream - * @throws IOException - */ - public final void dump(final DataOutputStream file) throws IOException { - file.writeShort(bootstrapMethodRef); - file.writeShort(bootstrapArguments.length); - for (final int bootstrap_argument : bootstrapArguments) { - file.writeShort(bootstrap_argument); - } - } - - /** - * @return deep copy of this object - */ - public BootstrapMethod copy() { - try { - return (BootstrapMethod) clone(); - } catch (final CloneNotSupportedException e) { - // TODO should this throw? - } - return null; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/BootstrapMethods.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/BootstrapMethods.java deleted file mode 100644 index 3abe716b..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/BootstrapMethods.java +++ /dev/null @@ -1,151 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * This class represents a BootstrapMethods attribute. - * - * @see - * The class File Format : The BootstrapMethods Attribute - * @since 6.0 - */ -public class BootstrapMethods extends Attribute { - - private BootstrapMethod[] bootstrapMethods; // TODO this could be made final (setter is not used) - - /** - * Initialize from another object. Note that both objects use the same - * references (shallow copy). Use clone() for a physical copy. - */ - public BootstrapMethods(final BootstrapMethods c) { - this(c.getNameIndex(), c.getLength(), c.getBootstrapMethods(), c.getConstantPool()); - } - - - /** - * @param name_index Index in constant pool to CONSTANT_Utf8 - * @param length Content length in bytes - * @param bootstrapMethods array of bootstrap methods - * @param constant_pool Array of constants - */ - public BootstrapMethods(final int name_index, final int length, final BootstrapMethod[] bootstrapMethods, final ConstantPool constant_pool) { - super(Const.ATTR_BOOTSTRAP_METHODS, name_index, length, constant_pool); - this.bootstrapMethods = bootstrapMethods; - } - - /** - * Construct object from Input stream. - * - * @param name_index Index in constant pool to CONSTANT_Utf8 - * @param length Content length in bytes - * @param input Input stream - * @param constant_pool Array of constants - * @throws IOException - */ - BootstrapMethods(final int name_index, final int length, final DataInput input, final ConstantPool constant_pool) throws IOException { - this(name_index, length, (BootstrapMethod[]) null, constant_pool); - - final int num_bootstrap_methods = input.readUnsignedShort(); - bootstrapMethods = new BootstrapMethod[num_bootstrap_methods]; - for (int i = 0; i < num_bootstrap_methods; i++) { - bootstrapMethods[i] = new BootstrapMethod(input); - } - } - - /** - * @return array of bootstrap method "records" - */ - public final BootstrapMethod[] getBootstrapMethods() { - return bootstrapMethods; - } - - /** - * @param bootstrapMethods the array of bootstrap methods - */ - public final void setBootstrapMethods(final BootstrapMethod[] bootstrapMethods) { - this.bootstrapMethods = bootstrapMethods; - } - - /** - * @param v Visitor object - */ - @Override - public void accept(final Visitor v) { - v.visitBootstrapMethods(this); - } - - /** - * @return deep copy of this attribute - */ - @Override - public BootstrapMethods copy(final ConstantPool _constant_pool) { - final BootstrapMethods c = (BootstrapMethods) clone(); - c.bootstrapMethods = new BootstrapMethod[bootstrapMethods.length]; - - for (int i = 0; i < bootstrapMethods.length; i++) { - c.bootstrapMethods[i] = bootstrapMethods[i].copy(); - } - c.setConstantPool(_constant_pool); - return c; - } - - /** - * Dump bootstrap methods attribute to file stream in binary format. - * - * @param file Output file stream - * @throws IOException - */ - @Override - public final void dump(final DataOutputStream file) throws IOException { - super.dump(file); - - file.writeShort(bootstrapMethods.length); - for (final BootstrapMethod bootstrap_method : bootstrapMethods) { - bootstrap_method.dump(file); - } - } - - /** - * @return String representation. - */ - @Override - public final String toString() { - final StringBuilder buf = new StringBuilder(); - buf.append("BootstrapMethods("); - buf.append(bootstrapMethods.length); - buf.append("):"); - for (int i = 0; i < bootstrapMethods.length; i++) { - buf.append("\n"); - final int start = buf.length(); - buf.append(" ").append(i).append(": "); - final int indent_count = buf.length() - start; - final String[] lines = (bootstrapMethods[i].toString(super.getConstantPool())).split("\\r?\\n"); - buf.append(lines[0]); - for (int j = 1; j < lines.length; j++) { - buf.append("\n").append(" ".substring(0,indent_count)).append(lines[j]); - } - } - return buf.toString(); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ClassElementValue.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ClassElementValue.java deleted file mode 100644 index 2a62a872..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ClassElementValue.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * @since 6.0 - */ -public class ClassElementValue extends ElementValue -{ - // For primitive types and string type, this points to the value entry in - // the cpool - // For 'class' this points to the class entry in the cpool - private final int idx; - - public ClassElementValue(final int type, final int idx, final ConstantPool cpool) - { - super(type, cpool); - this.idx = idx; - } - - public int getIndex() - { - return idx; - } - - public String getClassString() - { - final ConstantUtf8 c = (ConstantUtf8) super.getConstantPool().getConstant(idx, - Const.CONSTANT_Utf8); - return c.getBytes(); - } - - @Override - public String stringifyValue() - { - final ConstantUtf8 cu8 = (ConstantUtf8) super.getConstantPool().getConstant(idx, - Const.CONSTANT_Utf8); - return cu8.getBytes(); - } - - @Override - public void dump(final DataOutputStream dos) throws IOException - { - dos.writeByte(super.getType()); // u1 kind of value - dos.writeShort(idx); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ClassFormatException.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ClassFormatException.java deleted file mode 100644 index 963cc266..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ClassFormatException.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -/** - * Thrown when the BCEL attempts to read a class file and determines - * that the file is malformed or otherwise cannot be interpreted as a - * class file. - * - */ -public class ClassFormatException extends RuntimeException { - - private static final long serialVersionUID = -3569097343160139969L; - - public ClassFormatException() { - super(); - } - - - public ClassFormatException(final String s) { - super(s); - } - - /** - * @since 6.0 - */ - public ClassFormatException(final String message, final Throwable cause) { - super(message, cause); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ClassParser.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ClassParser.java deleted file mode 100644 index a592bfed..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ClassParser.java +++ /dev/null @@ -1,307 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.BufferedInputStream; -import java.io.DataInputStream; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.zip.ZipEntry; -import java.util.zip.ZipFile; - -import org.apache.bcel.Const; - -/** - * Wrapper class that parses a given Java .class file. The method parse returns a - * JavaClass object on success. When an I/O error or an - * inconsistency occurs an appropiate exception is propagated back to - * the caller. - * - * The structure and the names comply, except for a few conveniences, - * exactly with the - * JVM specification 1.0. See this paper for - * further details about the structure of a bytecode file. - * - */ -public final class ClassParser { - - private DataInputStream dataInputStream; - private final boolean fileOwned; - private final String fileName; - private String zipFile; - private int classNameIndex; - private int superclassNameIndex; - private int major; // Compiler version - private int minor; // Compiler version - private int accessFlags; // Access rights of parsed class - private int[] interfaces; // Names of implemented interfaces - private ConstantPool constantPool; // collection of constants - private Field[] fields; // class fields, i.e., its variables - private Method[] methods; // methods defined in the class - private Attribute[] attributes; // attributes defined in the class - private final boolean isZip; // Loaded from zip file - private static final int BUFSIZE = 8192; - - - /** - * Parses class from the given stream. - * - * @param inputStream Input stream - * @param fileName File name - */ - public ClassParser(final InputStream inputStream, final String fileName) { - this.fileName = fileName; - fileOwned = false; - final String clazz = inputStream.getClass().getName(); // Not a very clean solution ... - isZip = clazz.startsWith("java.util.zip.") || clazz.startsWith("java.util.jar."); - if (inputStream instanceof DataInputStream) { - this.dataInputStream = (DataInputStream) inputStream; - } else { - this.dataInputStream = new DataInputStream(new BufferedInputStream(inputStream, BUFSIZE)); - } - } - - - /** Parses class from given .class file. - * - * @param fileName file name - */ - public ClassParser(final String fileName) { - isZip = false; - this.fileName = fileName; - fileOwned = true; - } - - - /** Parses class from given .class file in a ZIP-archive - * - * @param zipFile zip file name - * @param fileName file name - */ - public ClassParser(final String zipFile, final String fileName) { - isZip = true; - fileOwned = true; - this.zipFile = zipFile; - this.fileName = fileName; - } - - - /** - * Parses the given Java class file and return an object that represents - * the contained data, i.e., constants, methods, fields and commands. - * A ClassFormatException is raised, if the file is not a valid - * .class file. (This does not include verification of the byte code as it - * is performed by the java interpreter). - * - * @return Class object representing the parsed class file - * @throws IOException - * @throws ClassFormatException - */ - public JavaClass parse() throws IOException, ClassFormatException { - ZipFile zip = null; - try { - if (fileOwned) { - if (isZip) { - zip = new ZipFile(zipFile); - final ZipEntry entry = zip.getEntry(fileName); - - if (entry == null) { - throw new IOException("File " + fileName + " not found"); - } - - dataInputStream = new DataInputStream(new BufferedInputStream(zip.getInputStream(entry), - BUFSIZE)); - } else { - dataInputStream = new DataInputStream(new BufferedInputStream(new FileInputStream( - fileName), BUFSIZE)); - } - } - /****************** Read headers ********************************/ - // Check magic tag of class file - readID(); - // Get compiler version - readVersion(); - /****************** Read constant pool and related **************/ - // Read constant pool entries - readConstantPool(); - // Get class information - readClassInfo(); - // Get interface information, i.e., implemented interfaces - readInterfaces(); - /****************** Read class fields and methods ***************/ - // Read class fields, i.e., the variables of the class - readFields(); - // Read class methods, i.e., the functions in the class - readMethods(); - // Read class attributes - readAttributes(); - // Check for unknown variables - //Unknown[] u = Unknown.getUnknownAttributes(); - //for (int i=0; i < u.length; i++) - // System.err.println("WARNING: " + u[i]); - // Everything should have been read now - // if(file.available() > 0) { - // int bytes = file.available(); - // byte[] buf = new byte[bytes]; - // file.read(buf); - // if(!(isZip && (buf.length == 1))) { - // System.err.println("WARNING: Trailing garbage at end of " + fileName); - // System.err.println(bytes + " extra bytes: " + Utility.toHexString(buf)); - // } - // } - } finally { - // Read everything of interest, so close the file - if (fileOwned) { - try { - if (dataInputStream != null) { - dataInputStream.close(); - } - } catch (final IOException ioe) { - //ignore close exceptions - } - } - try { - if (zip != null) { - zip.close(); - } - } catch (final IOException ioe) { - //ignore close exceptions - } - } - // Return the information we have gathered in a new object - return new JavaClass(classNameIndex, superclassNameIndex, fileName, major, minor, - accessFlags, constantPool, interfaces, fields, methods, attributes, isZip - ? JavaClass.ZIP - : JavaClass.FILE); - } - - - /** - * Reads information about the attributes of the class. - * @throws IOException - * @throws ClassFormatException - */ - private void readAttributes() throws IOException, ClassFormatException { - final int attributes_count = dataInputStream.readUnsignedShort(); - attributes = new Attribute[attributes_count]; - for (int i = 0; i < attributes_count; i++) { - attributes[i] = Attribute.readAttribute(dataInputStream, constantPool); - } - } - - - /** - * Reads information about the class and its super class. - * @throws IOException - * @throws ClassFormatException - */ - private void readClassInfo() throws IOException, ClassFormatException { - accessFlags = dataInputStream.readUnsignedShort(); - /* Interfaces are implicitely abstract, the flag should be set - * according to the JVM specification. - */ - if ((accessFlags & Const.ACC_INTERFACE) != 0) { - accessFlags |= Const.ACC_ABSTRACT; - } - if (((accessFlags & Const.ACC_ABSTRACT) != 0) - && ((accessFlags & Const.ACC_FINAL) != 0)) { - throw new ClassFormatException("Class " + fileName + " can't be both final and abstract"); - } - classNameIndex = dataInputStream.readUnsignedShort(); - superclassNameIndex = dataInputStream.readUnsignedShort(); - } - - - /** - * Reads constant pool entries. - * @throws IOException - * @throws ClassFormatException - */ - private void readConstantPool() throws IOException, ClassFormatException { - constantPool = new ConstantPool(dataInputStream); - } - - - /** - * Reads information about the fields of the class, i.e., its variables. - * @throws IOException - * @throws ClassFormatException - */ - private void readFields() throws IOException, ClassFormatException { - final int fields_count = dataInputStream.readUnsignedShort(); - fields = new Field[fields_count]; - for (int i = 0; i < fields_count; i++) { - fields[i] = new Field(dataInputStream, constantPool); - } - } - - - /******************** Private utility methods **********************/ - /** - * Checks whether the header of the file is ok. - * Of course, this has to be the first action on successive file reads. - * @throws IOException - * @throws ClassFormatException - */ - private void readID() throws IOException, ClassFormatException { - if (dataInputStream.readInt() != Const.JVM_CLASSFILE_MAGIC) { - throw new ClassFormatException(fileName + " is not a Java .class file"); - } - } - - - /** - * Reads information about the interfaces implemented by this class. - * @throws IOException - * @throws ClassFormatException - */ - private void readInterfaces() throws IOException, ClassFormatException { - final int interfaces_count = dataInputStream.readUnsignedShort(); - interfaces = new int[interfaces_count]; - for (int i = 0; i < interfaces_count; i++) { - interfaces[i] = dataInputStream.readUnsignedShort(); - } - } - - - /** - * Reads information about the methods of the class. - * @throws IOException - * @throws ClassFormatException - */ - private void readMethods() throws IOException, ClassFormatException { - final int methods_count = dataInputStream.readUnsignedShort(); - methods = new Method[methods_count]; - for (int i = 0; i < methods_count; i++) { - methods[i] = new Method(dataInputStream, constantPool); - } - } - - - /** - * Reads major and minor version of compiler which created the file. - * @throws IOException - * @throws ClassFormatException - */ - private void readVersion() throws IOException, ClassFormatException { - minor = dataInputStream.readUnsignedShort(); - major = dataInputStream.readUnsignedShort(); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/Code.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/Code.java deleted file mode 100644 index 5e81d21f..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/Code.java +++ /dev/null @@ -1,355 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * This class represents a chunk of Java byte code contained in a - * method. It is instantiated by the - * Attribute.readAttribute() method. A Code - * attribute contains informations about operand stack, local - * variables, byte code and the exceptions handled within this - * method. - * - * This attribute has attributes itself, namely LineNumberTable which - * is used for debugging purposes and LocalVariableTable which - * contains information about the local variables. - * - * @see Attribute - * @see CodeException - * @see LineNumberTable - * @see LocalVariableTable - */ -public final class Code extends Attribute { - - private int maxStack; // Maximum size of stack used by this method // TODO this could be made final (setter is not used) - private int maxLocals; // Number of local variables // TODO this could be made final (setter is not used) - private byte[] code; // Actual byte code - private CodeException[] exceptionTable; // Table of handled exceptions - private Attribute[] attributes; // or LocalVariable - - - /** - * Initialize from another object. Note that both objects use the same - * references (shallow copy). Use copy() for a physical copy. - */ - public Code(final Code c) { - this(c.getNameIndex(), c.getLength(), c.getMaxStack(), c.getMaxLocals(), c.getCode(), c - .getExceptionTable(), c.getAttributes(), c.getConstantPool()); - } - - - /** - * @param name_index Index pointing to the name Code - * @param length Content length in bytes - * @param file Input stream - * @param constant_pool Array of constants - */ - Code(final int name_index, final int length, final DataInput file, final ConstantPool constant_pool) - throws IOException { - // Initialize with some default values which will be overwritten later - this(name_index, length, file.readUnsignedShort(), file.readUnsignedShort(), (byte[]) null, - (CodeException[]) null, (Attribute[]) null, constant_pool); - final int code_length = file.readInt(); - code = new byte[code_length]; // Read byte code - file.readFully(code); - /* Read exception table that contains all regions where an exception - * handler is active, i.e., a try { ... } catch() block. - */ - final int exception_table_length = file.readUnsignedShort(); - exceptionTable = new CodeException[exception_table_length]; - for (int i = 0; i < exception_table_length; i++) { - exceptionTable[i] = new CodeException(file); - } - /* Read all attributes, currently `LineNumberTable' and - * `LocalVariableTable' - */ - final int attributes_count = file.readUnsignedShort(); - attributes = new Attribute[attributes_count]; - for (int i = 0; i < attributes_count; i++) { - attributes[i] = Attribute.readAttribute(file, constant_pool); - } - /* Adjust length, because of setAttributes in this(), s.b. length - * is incorrect, because it didn't take the internal attributes - * into account yet! Very subtle bug, fixed in 3.1.1. - */ - super.setLength(length); - } - - - /** - * @param name_index Index pointing to the name Code - * @param length Content length in bytes - * @param maxStack Maximum size of stack - * @param maxLocals Number of local variables - * @param code Actual byte code - * @param exceptionTable of handled exceptions - * @param attributes Attributes of code: LineNumber or LocalVariable - * @param constant_pool Array of constants - */ - public Code(final int name_index, final int length, final int maxStack, final int maxLocals, final byte[] code, - final CodeException[] exceptionTable, final Attribute[] attributes, final ConstantPool constant_pool) { - super(Const.ATTR_CODE, name_index, length, constant_pool); - this.maxStack = maxStack; - this.maxLocals = maxLocals; - this.code = code != null ? code : new byte[0]; - this.exceptionTable = exceptionTable != null ? exceptionTable : new CodeException[0]; - this.attributes = attributes != null ? attributes : new Attribute[0]; - super.setLength(calculateLength()); // Adjust length - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitely - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitCode(this); - } - - - /** - * Dump code attribute to file stream in binary format. - * - * @param file Output file stream - * @throws IOException - */ - @Override - public void dump( final DataOutputStream file ) throws IOException { - super.dump(file); - file.writeShort(maxStack); - file.writeShort(maxLocals); - file.writeInt(code.length); - file.write(code, 0, code.length); - file.writeShort(exceptionTable.length); - for (final CodeException exception : exceptionTable) { - exception.dump(file); - } - file.writeShort(attributes.length); - for (final Attribute attribute : attributes) { - attribute.dump(file); - } - } - - - /** - * @return Collection of code attributes. - * @see Attribute - */ - public Attribute[] getAttributes() { - return attributes; - } - - - /** - * @return LineNumberTable of Code, if it has one - */ - public LineNumberTable getLineNumberTable() { - for (final Attribute attribute : attributes) { - if (attribute instanceof LineNumberTable) { - return (LineNumberTable) attribute; - } - } - return null; - } - - - /** - * @return LocalVariableTable of Code, if it has one - */ - public LocalVariableTable getLocalVariableTable() { - for (final Attribute attribute : attributes) { - if (attribute instanceof LocalVariableTable) { - return (LocalVariableTable) attribute; - } - } - return null; - } - - - /** - * @return Actual byte code of the method. - */ - public byte[] getCode() { - return code; - } - - - /** - * @return Table of handled exceptions. - * @see CodeException - */ - public CodeException[] getExceptionTable() { - return exceptionTable; - } - - - /** - * @return Number of local variables. - */ - public int getMaxLocals() { - return maxLocals; - } - - - /** - * @return Maximum size of stack used by this method. - */ - public int getMaxStack() { - return maxStack; - } - - - /** - * @return the internal length of this code attribute (minus the first 6 bytes) - * and excluding all its attributes - */ - private int getInternalLength() { - return 2 /*maxStack*/+ 2 /*maxLocals*/+ 4 /*code length*/ - + code.length /*byte-code*/ - + 2 /*exception-table length*/ - + 8 * (exceptionTable == null ? 0 : exceptionTable.length) /* exception table */ - + 2 /* attributes count */; - } - - - /** - * @return the full size of this code attribute, minus its first 6 bytes, - * including the size of all its contained attributes - */ - private int calculateLength() { - int len = 0; - if (attributes != null) { - for (final Attribute attribute : attributes) { - len += attribute.getLength() + 6 /*attribute header size*/; - } - } - return len + getInternalLength(); - } - - - /** - * @param attributes the attributes to set for this Code - */ - public void setAttributes( final Attribute[] attributes ) { - this.attributes = attributes != null ? attributes : new Attribute[0]; - super.setLength(calculateLength()); // Adjust length - } - - - /** - * @param code byte code - */ - public void setCode( final byte[] code ) { - this.code = code != null ? code : new byte[0]; - super.setLength(calculateLength()); // Adjust length - } - - - /** - * @param exceptionTable exception table - */ - public void setExceptionTable( final CodeException[] exceptionTable ) { - this.exceptionTable = exceptionTable != null ? exceptionTable : new CodeException[0]; - super.setLength(calculateLength()); // Adjust length - } - - - /** - * @param maxLocals maximum number of local variables - */ - public void setMaxLocals( final int maxLocals ) { - this.maxLocals = maxLocals; - } - - - /** - * @param maxStack maximum stack size - */ - public void setMaxStack( final int maxStack ) { - this.maxStack = maxStack; - } - - - /** - * @return String representation of code chunk. - */ - public String toString( final boolean verbose ) { - final StringBuilder buf = new StringBuilder(100); // CHECKSTYLE IGNORE MagicNumber - buf.append("Code(maxStack = ").append(maxStack).append(", maxLocals = ").append( - maxLocals).append(", code_length = ").append(code.length).append(")\n").append( - Utility.codeToString(code, super.getConstantPool(), 0, -1, verbose)); - if (exceptionTable.length > 0) { - buf.append("\nException handler(s) = \n").append("From\tTo\tHandler\tType\n"); - for (final CodeException exception : exceptionTable) { - buf.append(exception.toString(super.getConstantPool(), verbose)).append("\n"); - } - } - if (attributes.length > 0) { - buf.append("\nAttribute(s) = "); - for (final Attribute attribute : attributes) { - buf.append("\n").append(attribute.getName()).append(":"); - buf.append("\n").append(attribute); - } - } - return buf.toString(); - } - - - /** - * @return String representation of code chunk. - */ - @Override - public String toString() { - return toString(true); - } - - - /** - * @return deep copy of this attribute - * - * @param _constant_pool the constant pool to duplicate - */ - @Override - public Attribute copy( final ConstantPool _constant_pool ) { - final Code c = (Code) clone(); - if (code != null) { - c.code = new byte[code.length]; - System.arraycopy(code, 0, c.code, 0, code.length); - } - c.setConstantPool(_constant_pool); - c.exceptionTable = new CodeException[exceptionTable.length]; - for (int i = 0; i < exceptionTable.length; i++) { - c.exceptionTable[i] = exceptionTable[i].copy(); - } - c.attributes = new Attribute[attributes.length]; - for (int i = 0; i < attributes.length; i++) { - c.attributes[i] = attributes[i].copy(_constant_pool); - } - return c; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/CodeException.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/CodeException.java deleted file mode 100644 index d223f08e..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/CodeException.java +++ /dev/null @@ -1,217 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; -import org.apache.bcel.Constants; - -/** - * This class represents an entry in the exception table of the Code - * attribute and is used only there. It contains a range in which a - * particular exception handler is active. - * - * @see Code - */ -public final class CodeException implements Cloneable, Node, Constants { - - private int startPc; // Range in the code the exception handler is - private int endPc; // active. startPc is inclusive, endPc exclusive - private int handlerPc; /* Starting address of exception handler, i.e., - * an offset from start of code. - */ - private int catchType; /* If this is zero the handler catches any - * exception, otherwise it points to the - * exception class which is to be caught. - */ - - - /** - * Initialize from another object. - */ - public CodeException(final CodeException c) { - this(c.getStartPC(), c.getEndPC(), c.getHandlerPC(), c.getCatchType()); - } - - - /** - * Construct object from file stream. - * @param file Input stream - * @throws IOException - */ - CodeException(final DataInput file) throws IOException { - this(file.readUnsignedShort(), file.readUnsignedShort(), file.readUnsignedShort(), file - .readUnsignedShort()); - } - - - /** - * @param startPc Range in the code the exception handler is active, - * startPc is inclusive while - * @param endPc is exclusive - * @param handlerPc Starting address of exception handler, i.e., - * an offset from start of code. - * @param catchType If zero the handler catches any - * exception, otherwise it points to the exception class which is - * to be caught. - */ - public CodeException(final int startPc, final int endPc, final int handlerPc, final int catchType) { - this.startPc = startPc; - this.endPc = endPc; - this.handlerPc = handlerPc; - this.catchType = catchType; - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitely - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitCodeException(this); - } - - - /** - * Dump code exception to file stream in binary format. - * - * @param file Output file stream - * @throws IOException - */ - public void dump( final DataOutputStream file ) throws IOException { - file.writeShort(startPc); - file.writeShort(endPc); - file.writeShort(handlerPc); - file.writeShort(catchType); - } - - - /** - * @return 0, if the handler catches any exception, otherwise it points to - * the exception class which is to be caught. - */ - public int getCatchType() { - return catchType; - } - - - /** - * @return Exclusive end index of the region where the handler is active. - */ - public int getEndPC() { - return endPc; - } - - - /** - * @return Starting address of exception handler, relative to the code. - */ - public int getHandlerPC() { - return handlerPc; - } - - - /** - * @return Inclusive start index of the region where the handler is active. - */ - public int getStartPC() { - return startPc; - } - - - /** - * @param catchType the type of exception that is caught - */ - public void setCatchType( final int catchType ) { - this.catchType = catchType; - } - - - /** - * @param endPc end of handled block - */ - public void setEndPC( final int endPc ) { - this.endPc = endPc; - } - - - /** - * @param handlerPc where the actual code is - */ - public void setHandlerPC( final int handlerPc ) { // TODO unused - this.handlerPc = handlerPc; - } - - - /** - * @param startPc start of handled block - */ - public void setStartPC( final int startPc ) { // TODO unused - this.startPc = startPc; - } - - - /** - * @return String representation. - */ - @Override - public String toString() { - return "CodeException(startPc = " + startPc + ", endPc = " + endPc + ", handlerPc = " - + handlerPc + ", catchType = " + catchType + ")"; - } - - - /** - * @return String representation. - */ - public String toString( final ConstantPool cp, final boolean verbose ) { - String str; - if (catchType == 0) { - str = "(0)"; - } else { - str = Utility.compactClassName(cp.getConstantString(catchType, Const.CONSTANT_Class), false) - + (verbose ? "(" + catchType + ")" : ""); - } - return startPc + "\t" + endPc + "\t" + handlerPc + "\t" + str; - } - - - public String toString( final ConstantPool cp ) { - return toString(cp, true); - } - - - /** - * @return deep copy of this object - */ - public CodeException copy() { - try { - return (CodeException) clone(); - } catch (final CloneNotSupportedException e) { - // TODO should this throw? - } - return null; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/Constant.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/Constant.java deleted file mode 100644 index 36061ed2..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/Constant.java +++ /dev/null @@ -1,206 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; -import java.util.Objects; - -import org.apache.bcel.Const; -import org.apache.bcel.util.BCELComparator; - -/** - * Abstract superclass for classes to represent the different constant types - * in the constant pool of a class file. The classes keep closely to - * the JVM specification. - */ -public abstract class Constant implements Cloneable, Node { - - private static BCELComparator bcelComparator = new BCELComparator() { - - @Override - public boolean equals( final Object o1, final Object o2 ) { - final Constant THIS = (Constant) o1; - final Constant THAT = (Constant) o2; - return Objects.equals(THIS.toString(), THAT.toString()); - } - - - @Override - public int hashCode( final Object o ) { - final Constant THIS = (Constant) o; - return THIS.toString().hashCode(); - } - }; - - /* In fact this tag is redundant since we can distinguish different - * `Constant' objects by their type, i.e., via `instanceof'. In some - * places we will use the tag for switch()es anyway. - * - * First, we want match the specification as closely as possible. Second we - * need the tag as an index to select the corresponding class name from the - * `CONSTANT_NAMES' array. - */ - /** - * @deprecated (since 6.0) will be made private; do not access directly, use getter/setter - */ - @java.lang.Deprecated - protected byte tag; // TODO should be private & final - - Constant(final byte tag) { - this.tag = tag; - } - - /** - * Called by objects that are traversing the nodes of the tree implicitely - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public abstract void accept( Visitor v ); - - public abstract void dump( DataOutputStream file ) throws IOException; - - /** - * @return Tag of constant, i.e., its type. No setTag() method to avoid - * confusion. - */ - public final byte getTag() { - return tag; - } - - /** - * @return String representation. - */ - @Override - public String toString() { - return Const.getConstantName(tag) + "[" + tag + "]"; - } - - /** - * @return deep copy of this constant - */ - public Constant copy() { - try { - return (Constant) super.clone(); - } catch (final CloneNotSupportedException e) { - // TODO should this throw? - } - return null; - } - - @Override - public Object clone() { - try { - return super.clone(); - } catch (final CloneNotSupportedException e) { - throw new Error("Clone Not Supported"); // never happens - } - } - - /** - * Reads one constant from the given input, the type depends on a tag byte. - * - * @param dataInput Input stream - * @return Constant object - * @throws IOException if an I/O error occurs reading from the given {@code dataInput}. - * @throws ClassFormatException if the next byte is not recognized - * @since 6.0 made public - */ - public static Constant readConstant(final DataInput dataInput) throws IOException, ClassFormatException { - final byte b = dataInput.readByte(); // Read tag byte - switch (b) { - case Const.CONSTANT_Class: - return new ConstantClass(dataInput); - case Const.CONSTANT_Fieldref: - return new ConstantFieldref(dataInput); - case Const.CONSTANT_Methodref: - return new ConstantMethodref(dataInput); - case Const.CONSTANT_InterfaceMethodref: - return new ConstantInterfaceMethodref(dataInput); - case Const.CONSTANT_String: - return new ConstantString(dataInput); - case Const.CONSTANT_Integer: - return new ConstantInteger(dataInput); - case Const.CONSTANT_Float: - return new ConstantFloat(dataInput); - case Const.CONSTANT_Long: - return new ConstantLong(dataInput); - case Const.CONSTANT_Double: - return new ConstantDouble(dataInput); - case Const.CONSTANT_NameAndType: - return new ConstantNameAndType(dataInput); - case Const.CONSTANT_Utf8: - return ConstantUtf8.getInstance(dataInput); - case Const.CONSTANT_MethodHandle: - return new ConstantMethodHandle(dataInput); - case Const.CONSTANT_MethodType: - return new ConstantMethodType(dataInput); - case Const.CONSTANT_Dynamic: - return new ConstantDynamic(dataInput); - case Const.CONSTANT_InvokeDynamic: - return new ConstantInvokeDynamic(dataInput); - case Const.CONSTANT_Module: - return new ConstantModule(dataInput); - case Const.CONSTANT_Package: - return new ConstantPackage(dataInput); - default: - throw new ClassFormatException("Invalid byte tag in constant pool: " + b); - } - } - - /** - * @return Comparison strategy object - */ - public static BCELComparator getComparator() { - return bcelComparator; - } - - /** - * @param comparator Comparison strategy object - */ - public static void setComparator( final BCELComparator comparator ) { - bcelComparator = comparator; - } - - /** - * Returns value as defined by given BCELComparator strategy. - * By default two Constant objects are said to be equal when - * the result of toString() is equal. - * - * @see java.lang.Object#equals(java.lang.Object) - */ - @Override - public boolean equals( final Object obj ) { - return bcelComparator.equals(this, obj); - } - - /** - * Returns value as defined by given BCELComparator strategy. - * By default return the hashcode of the result of toString(). - * - * @see java.lang.Object#hashCode() - */ - @Override - public int hashCode() { - return bcelComparator.hashCode(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantCP.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantCP.java deleted file mode 100644 index 73e675c7..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantCP.java +++ /dev/null @@ -1,150 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * Abstract super class for Fieldref, Methodref, InterfaceMethodref and - * InvokeDynamic constants. - * - * @see ConstantFieldref - * @see ConstantMethodref - * @see ConstantInterfaceMethodref - * @see ConstantInvokeDynamic - */ -public abstract class ConstantCP extends Constant { - - /** References to the constants containing the class and the field signature - */ - // Note that this field is used to store the - // bootstrap_method_attr_index of a ConstantInvokeDynamic. - /** - * @deprecated (since 6.0) will be made private; do not access directly, use getter/setter - */ - @java.lang.Deprecated - protected int class_index; // TODO make private (has getter & setter) - // This field has the same meaning for all subclasses. - - /** - * @deprecated (since 6.0) will be made private; do not access directly, use getter/setter - */ - @java.lang.Deprecated - protected int name_and_type_index; // TODO make private (has getter & setter) - - - /** - * Initialize from another object. - */ - public ConstantCP(final ConstantCP c) { - this(c.getTag(), c.getClassIndex(), c.getNameAndTypeIndex()); - } - - - /** - * Initialize instance from file data. - * - * @param tag Constant type tag - * @param file Input stream - * @throws IOException - */ - ConstantCP(final byte tag, final DataInput file) throws IOException { - this(tag, file.readUnsignedShort(), file.readUnsignedShort()); - } - - - /** - * @param class_index Reference to the class containing the field - * @param name_and_type_index and the field signature - */ - protected ConstantCP(final byte tag, final int class_index, final int name_and_type_index) { - super(tag); - this.class_index = class_index; - this.name_and_type_index = name_and_type_index; - } - - - /** - * Dump constant field reference to file stream in binary format. - * - * @param file Output file stream - * @throws IOException - */ - @Override - public final void dump( final DataOutputStream file ) throws IOException { - file.writeByte(super.getTag()); - file.writeShort(class_index); - file.writeShort(name_and_type_index); - } - - - /** - * @return Reference (index) to class this constant refers to. - */ - public final int getClassIndex() { - return class_index; - } - - - /** - * @param class_index points to Constant_class - */ - public final void setClassIndex( final int class_index ) { - this.class_index = class_index; - } - - - /** - * @return Reference (index) to signature of the field. - */ - public final int getNameAndTypeIndex() { - return name_and_type_index; - } - - - /** - * @param name_and_type_index points to Constant_NameAndType - */ - public final void setNameAndTypeIndex( final int name_and_type_index ) { - this.name_and_type_index = name_and_type_index; - } - - - /** - * @return Class this field belongs to. - */ - public String getClass( final ConstantPool cp ) { - return cp.constantToString(class_index, Const.CONSTANT_Class); - } - - - /** - * @return String representation. - * - * not final as ConstantInvokeDynamic needs to modify - */ - @Override - public String toString() { - return super.toString() + "(class_index = " + class_index + ", name_and_type_index = " - + name_and_type_index + ")"; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantClass.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantClass.java deleted file mode 100644 index f77ecc3d..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantClass.java +++ /dev/null @@ -1,131 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * This class is derived from the abstract {@link Constant} - * and represents a reference to a (external) class. - * - * @see Constant - */ -public final class ConstantClass extends Constant implements ConstantObject { - - private int nameIndex; // Identical to ConstantString except for the name - - - /** - * Initialize from another object. - */ - public ConstantClass(final ConstantClass c) { - this(c.getNameIndex()); - } - - - /** - * Constructs an instance from file data. - * - * @param dataInput Input stream - * @throws IOException if an I/O error occurs reading from the given {@code dataInput}. - */ - ConstantClass(final DataInput dataInput) throws IOException { - this(dataInput.readUnsignedShort()); - } - - - /** - * @param nameIndex Name index in constant pool. Should refer to a - * ConstantUtf8. - */ - public ConstantClass(final int nameIndex) { - super(Const.CONSTANT_Class); - this.nameIndex = nameIndex; - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitely - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitConstantClass(this); - } - - - /** - * Dumps constant class to file stream in binary format. - * - * @param file Output file stream - * @throws IOException if an I/O error occurs writing to the DataOutputStream. - */ - @Override - public void dump( final DataOutputStream file ) throws IOException { - file.writeByte(super.getTag()); - file.writeShort(nameIndex); - } - - - /** - * @return Name index in constant pool of class name. - */ - public int getNameIndex() { - return nameIndex; - } - - - /** - * @param nameIndex the name index in the constant pool of this Constant Class - */ - public void setNameIndex( final int nameIndex ) { - this.nameIndex = nameIndex; - } - - - /** @return String object - */ - @Override - public Object getConstantValue( final ConstantPool cp ) { - final Constant c = cp.getConstant(nameIndex, Const.CONSTANT_Utf8); - return ((ConstantUtf8) c).getBytes(); - } - - - /** @return dereferenced string - */ - public String getBytes( final ConstantPool cp ) { - return (String) getConstantValue(cp); - } - - - /** - * @return String representation. - */ - @Override - public String toString() { - return super.toString() + "(nameIndex = " + nameIndex + ")"; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantDouble.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantDouble.java deleted file mode 100644 index 9ef7ce68..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantDouble.java +++ /dev/null @@ -1,122 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * This class is derived from the abstract {@link Constant} - * and represents a reference to a Double object. - * - * @see Constant - */ -public final class ConstantDouble extends Constant implements ConstantObject { - - private double bytes; - - - /** - * @param bytes Data - */ - public ConstantDouble(final double bytes) { - super(Const.CONSTANT_Double); - this.bytes = bytes; - } - - - /** - * Initialize from another object. - */ - public ConstantDouble(final ConstantDouble c) { - this(c.getBytes()); - } - - - /** - * Initialize instance from file data. - * - * @param file Input stream - * @throws IOException - */ - ConstantDouble(final DataInput file) throws IOException { - this(file.readDouble()); - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitely - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitConstantDouble(this); - } - - - /** - * Dump constant double to file stream in binary format. - * - * @param file Output file stream - * @throws IOException - */ - @Override - public void dump( final DataOutputStream file ) throws IOException { - file.writeByte(super.getTag()); - file.writeDouble(bytes); - } - - - /** - * @return data, i.e., 8 bytes. - */ - public double getBytes() { - return bytes; - } - - - /** - * @param bytes the raw bytes that represent the double value - */ - public void setBytes( final double bytes ) { - this.bytes = bytes; - } - - - /** - * @return String representation. - */ - @Override - public String toString() { - return super.toString() + "(bytes = " + bytes + ")"; - } - - - /** @return Double object - */ - @Override - public Object getConstantValue( final ConstantPool cp ) { - return new Double(bytes); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantDynamic.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantDynamic.java deleted file mode 100644 index b76db6dc..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantDynamic.java +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * This class is derived from the abstract {@link Constant} - * and represents a reference to a dynamically computed constant. - * - * @see Constant - * @see - * Change request for JEP 309 - * @since 6.3 - */ -public final class ConstantDynamic extends ConstantCP { - - /** - * Initialize from another object. - */ - public ConstantDynamic(final ConstantDynamic c) { - this(c.getBootstrapMethodAttrIndex(), c.getNameAndTypeIndex()); - } - - - /** - * Initialize instance from file data. - * - * @param file Input stream - * @throws IOException - */ - ConstantDynamic(final DataInput file) throws IOException { - this(file.readShort(), file.readShort()); - } - - - public ConstantDynamic(final int bootstrap_method_attr_index, final int name_and_type_index) { - super(Const.CONSTANT_Dynamic, bootstrap_method_attr_index, name_and_type_index); - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitly - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitConstantDynamic(this); - } - - /** - * @return Reference (index) to bootstrap method this constant refers to. - * - * Note that this method is a functional duplicate of getClassIndex - * for use by ConstantInvokeDynamic. - * @since 6.0 - */ - public int getBootstrapMethodAttrIndex() { - return super.getClassIndex(); // AKA bootstrap_method_attr_index - } - - /** - * @return String representation - */ - @Override - public String toString() { - return super.toString().replace("class_index", "bootstrap_method_attr_index"); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantFieldref.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantFieldref.java deleted file mode 100644 index 2c4e89d1..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantFieldref.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * This class represents a constant pool reference to a field. - * - */ -public final class ConstantFieldref extends ConstantCP { - - /** - * Initialize from another object. - */ - public ConstantFieldref(final ConstantFieldref c) { - super(Const.CONSTANT_Fieldref, c.getClassIndex(), c.getNameAndTypeIndex()); - } - - - /** - * Initialize instance from input data. - * - * @param input input stream - * @throws IOException - */ - ConstantFieldref(final DataInput input) throws IOException { - super(Const.CONSTANT_Fieldref, input); - } - - - /** - * @param class_index Reference to the class containing the Field - * @param name_and_type_index and the Field signature - */ - public ConstantFieldref(final int class_index, final int name_and_type_index) { - super(Const.CONSTANT_Fieldref, class_index, name_and_type_index); - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitely - * defined by the contents of a Java class. I.e., the hierarchy of Fields, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitConstantFieldref(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantFloat.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantFloat.java deleted file mode 100644 index 569021dc..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantFloat.java +++ /dev/null @@ -1,123 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * This class is derived from the abstract {@link Constant} - * and represents a reference to a float object. - * - * @see Constant - */ -public final class ConstantFloat extends Constant implements ConstantObject { - - private float bytes; - - - /** - * @param bytes Data - */ - public ConstantFloat(final float bytes) { - super(Const.CONSTANT_Float); - this.bytes = bytes; - } - - - /** - * Initialize from another object. Note that both objects use the same - * references (shallow copy). Use clone() for a physical copy. - */ - public ConstantFloat(final ConstantFloat c) { - this(c.getBytes()); - } - - - /** - * Initialize instance from file data. - * - * @param file Input stream - * @throws IOException - */ - ConstantFloat(final DataInput file) throws IOException { - this(file.readFloat()); - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitely - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitConstantFloat(this); - } - - - /** - * Dump constant float to file stream in binary format. - * - * @param file Output file stream - * @throws IOException - */ - @Override - public void dump( final DataOutputStream file ) throws IOException { - file.writeByte(super.getTag()); - file.writeFloat(bytes); - } - - - /** - * @return data, i.e., 4 bytes. - */ - public float getBytes() { - return bytes; - } - - - /** - * @param bytes the raw bytes that represent this float - */ - public void setBytes( final float bytes ) { - this.bytes = bytes; - } - - - /** - * @return String representation. - */ - @Override - public String toString() { - return super.toString() + "(bytes = " + bytes + ")"; - } - - - /** @return Float object - */ - @Override - public Object getConstantValue( final ConstantPool cp ) { - return new Float(bytes); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantInteger.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantInteger.java deleted file mode 100644 index 68b524da..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantInteger.java +++ /dev/null @@ -1,122 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * This class is derived from the abstract {@link Constant} - * and represents a reference to an int object. - * - * @see Constant - */ -public final class ConstantInteger extends Constant implements ConstantObject { - - private int bytes; - - - /** - * @param bytes Data - */ - public ConstantInteger(final int bytes) { - super(Const.CONSTANT_Integer); - this.bytes = bytes; - } - - - /** - * Initialize from another object. - */ - public ConstantInteger(final ConstantInteger c) { - this(c.getBytes()); - } - - - /** - * Initialize instance from file data. - * - * @param file Input stream - * @throws IOException - */ - ConstantInteger(final DataInput file) throws IOException { - this(file.readInt()); - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitely - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitConstantInteger(this); - } - - - /** - * Dump constant integer to file stream in binary format. - * - * @param file Output file stream - * @throws IOException - */ - @Override - public void dump( final DataOutputStream file ) throws IOException { - file.writeByte(super.getTag()); - file.writeInt(bytes); - } - - - /** - * @return data, i.e., 4 bytes. - */ - public int getBytes() { - return bytes; - } - - - /** - * @param bytes the raw bytes that represent this integer - */ - public void setBytes( final int bytes ) { - this.bytes = bytes; - } - - - /** - * @return String representation. - */ - @Override - public String toString() { - return super.toString() + "(bytes = " + bytes + ")"; - } - - - /** @return Integer object - */ - @Override - public Object getConstantValue( final ConstantPool cp ) { - return Integer.valueOf(bytes); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantInterfaceMethodref.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantInterfaceMethodref.java deleted file mode 100644 index b1c668a5..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantInterfaceMethodref.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * This class represents a constant pool reference to an interface method. - * - */ -public final class ConstantInterfaceMethodref extends ConstantCP { - - /** - * Initialize from another object. - */ - public ConstantInterfaceMethodref(final ConstantInterfaceMethodref c) { - super(Const.CONSTANT_InterfaceMethodref, c.getClassIndex(), c.getNameAndTypeIndex()); - } - - - /** - * Initialize instance from input data. - * - * @param input input stream - * @throws IOException - */ - ConstantInterfaceMethodref(final DataInput input) throws IOException { - super(Const.CONSTANT_InterfaceMethodref, input); - } - - - /** - * @param class_index Reference to the class containing the method - * @param name_and_type_index and the method signature - */ - public ConstantInterfaceMethodref(final int class_index, final int name_and_type_index) { - super(Const.CONSTANT_InterfaceMethodref, class_index, name_and_type_index); - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitely - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitConstantInterfaceMethodref(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantInvokeDynamic.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantInvokeDynamic.java deleted file mode 100644 index 830276ec..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantInvokeDynamic.java +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * This class is derived from the abstract {@link Constant} - * and represents a reference to a invoke dynamic. - * - * @see Constant - * @see - * The CONSTANT_InvokeDynamic_info Structure in The Java Virtual Machine Specification - * @since 6.0 - */ -public final class ConstantInvokeDynamic extends ConstantCP { - - /** - * Initialize from another object. - */ - public ConstantInvokeDynamic(final ConstantInvokeDynamic c) { - this(c.getBootstrapMethodAttrIndex(), c.getNameAndTypeIndex()); - } - - - /** - * Initialize instance from file data. - * - * @param file Input stream - * @throws IOException - */ - ConstantInvokeDynamic(final DataInput file) throws IOException { - this(file.readShort(), file.readShort()); - } - - - public ConstantInvokeDynamic(final int bootstrap_method_attr_index, final int name_and_type_index) { - super(Const.CONSTANT_InvokeDynamic, bootstrap_method_attr_index, name_and_type_index); - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitly - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitConstantInvokeDynamic(this); - } - - /** - * @return Reference (index) to bootstrap method this constant refers to. - * - * Note that this method is a functional duplicate of getClassIndex - * for use by ConstantInvokeDynamic. - * @since 6.0 - */ - public int getBootstrapMethodAttrIndex() { - return super.getClassIndex(); // AKA bootstrap_method_attr_index - } - - /** - * @return String representation - */ - @Override - public String toString() { - return super.toString().replace("class_index", "bootstrap_method_attr_index"); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantLong.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantLong.java deleted file mode 100644 index 821c3397..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantLong.java +++ /dev/null @@ -1,122 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * This class is derived from the abstract {@link Constant} - * and represents a reference to a long object. - * - * @see Constant - */ -public final class ConstantLong extends Constant implements ConstantObject { - - private long bytes; - - - /** - * @param bytes Data - */ - public ConstantLong(final long bytes) { - super(Const.CONSTANT_Long); - this.bytes = bytes; - } - - - /** - * Initialize from another object. - */ - public ConstantLong(final ConstantLong c) { - this(c.getBytes()); - } - - - /** - * Initialize instance from file data. - * - * @param file Input stream - * @throws IOException - */ - ConstantLong(final DataInput file) throws IOException { - this(file.readLong()); - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitely - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitConstantLong(this); - } - - - /** - * Dump constant long to file stream in binary format. - * - * @param file Output file stream - * @throws IOException - */ - @Override - public void dump( final DataOutputStream file ) throws IOException { - file.writeByte(super.getTag()); - file.writeLong(bytes); - } - - - /** - * @return data, i.e., 8 bytes. - */ - public long getBytes() { - return bytes; - } - - - /** - * @param bytes the raw bytes that represent this long - */ - public void setBytes( final long bytes ) { - this.bytes = bytes; - } - - - /** - * @return String representation. - */ - @Override - public String toString() { - return super.toString() + "(bytes = " + bytes + ")"; - } - - - /** @return Long object - */ - @Override - public Object getConstantValue( final ConstantPool cp ) { - return Long.valueOf(bytes); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantMethodHandle.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantMethodHandle.java deleted file mode 100644 index cd68fd4b..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantMethodHandle.java +++ /dev/null @@ -1,120 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * This class is derived from the abstract {@link Constant} - * and represents a reference to a method handle. - * - * @see Constant - * @since 6.0 - */ -public final class ConstantMethodHandle extends Constant { - - private int referenceKind; - private int referenceIndex; - - - /** - * Initialize from another object. - */ - public ConstantMethodHandle(final ConstantMethodHandle c) { - this(c.getReferenceKind(), c.getReferenceIndex()); - } - - - /** - * Initialize instance from file data. - * - * @param file Input stream - * @throws IOException - */ - ConstantMethodHandle(final DataInput file) throws IOException { - this(file.readUnsignedByte(), file.readUnsignedShort()); - } - - - public ConstantMethodHandle(final int reference_kind, final int reference_index) { - super(Const.CONSTANT_MethodHandle); - this.referenceKind = reference_kind; - this.referenceIndex = reference_index; - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitly - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitConstantMethodHandle(this); - } - - - /** - * Dump method kind and index to file stream in binary format. - * - * @param file Output file stream - * @throws IOException - */ - @Override - public void dump( final DataOutputStream file ) throws IOException { - file.writeByte(super.getTag()); - file.writeByte(referenceKind); - file.writeShort(referenceIndex); - } - - - public int getReferenceKind() { - return referenceKind; - } - - - public void setReferenceKind(final int reference_kind) { - this.referenceKind = reference_kind; - } - - - public int getReferenceIndex() { - return referenceIndex; - } - - - public void setReferenceIndex(final int reference_index) { - this.referenceIndex = reference_index; - } - - - /** - * @return String representation - */ - @Override - public String toString() { - return super.toString() + "(referenceKind = " + referenceKind + - ", referenceIndex = " + referenceIndex + ")"; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantMethodType.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantMethodType.java deleted file mode 100644 index d687e6ec..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantMethodType.java +++ /dev/null @@ -1,106 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * This class is derived from the abstract {@link Constant} - * and represents a reference to a method type. - * - * @see Constant - * @since 6.0 - */ -public final class ConstantMethodType extends Constant { - - private int descriptorIndex; - - - /** - * Initialize from another object. - */ - public ConstantMethodType(final ConstantMethodType c) { - this(c.getDescriptorIndex()); - } - - - /** - * Initialize instance from file data. - * - * @param file Input stream - * @throws IOException - */ - ConstantMethodType(final DataInput file) throws IOException { - this(file.readUnsignedShort()); - } - - - public ConstantMethodType(final int descriptor_index) { - super(Const.CONSTANT_MethodType); - this.descriptorIndex = descriptor_index; - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitly - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitConstantMethodType(this); - } - - - /** - * Dump name and signature index to file stream in binary format. - * - * @param file Output file stream - * @throws IOException - */ - @Override - public void dump( final DataOutputStream file ) throws IOException { - file.writeByte(super.getTag()); - file.writeShort(descriptorIndex); - } - - - public int getDescriptorIndex() { - return descriptorIndex; - } - - - public void setDescriptorIndex(final int descriptor_index) { - this.descriptorIndex = descriptor_index; - } - - - /** - * @return String representation - */ - @Override - public String toString() { - return super.toString() + "(descriptorIndex = " + descriptorIndex + ")"; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantMethodref.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantMethodref.java deleted file mode 100644 index 0e1e628d..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantMethodref.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * This class represents a constant pool reference to a method. - * - */ -public final class ConstantMethodref extends ConstantCP { - - /** - * Initialize from another object. - */ - public ConstantMethodref(final ConstantMethodref c) { - super(Const.CONSTANT_Methodref, c.getClassIndex(), c.getNameAndTypeIndex()); - } - - - /** - * Initialize instance from input data. - * - * @param input input stream - * @throws IOException - */ - ConstantMethodref(final DataInput input) throws IOException { - super(Const.CONSTANT_Methodref, input); - } - - - /** - * @param class_index Reference to the class containing the method - * @param name_and_type_index and the method signature - */ - public ConstantMethodref(final int class_index, final int name_and_type_index) { - super(Const.CONSTANT_Methodref, class_index, name_and_type_index); - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitely - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitConstantMethodref(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantModule.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantModule.java deleted file mode 100644 index 66cc2035..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantModule.java +++ /dev/null @@ -1,134 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * This class is derived from the abstract {@link Constant} - * and represents a reference to a module. - * - *

Note: Early access Java 9 support- currently subject to change

- * - * @see Constant - * @since 6.1 - */ -public final class ConstantModule extends Constant implements ConstantObject { - - private int nameIndex; - - - /** - * Initialize from another object. - */ - public ConstantModule(final ConstantModule c) { - this(c.getNameIndex()); - } - - - /** - * Initialize instance from file data. - * - * @param file Input stream - * @throws IOException - */ - ConstantModule(final DataInput file) throws IOException { - this(file.readUnsignedShort()); - } - - - /** - * @param nameIndex Name index in constant pool. Should refer to a - * ConstantUtf8. - */ - public ConstantModule(final int nameIndex) { - super(Const.CONSTANT_Module); - this.nameIndex = nameIndex; - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitly - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitConstantModule(this); - } - - - /** - * Dump constant module to file stream in binary format. - * - * @param file Output file stream - * @throws IOException - */ - @Override - public void dump( final DataOutputStream file ) throws IOException { - file.writeByte(super.getTag()); - file.writeShort(nameIndex); - } - - - /** - * @return Name index in constant pool of module name. - */ - public int getNameIndex() { - return nameIndex; - } - - - /** - * @param nameIndex the name index in the constant pool of this Constant Module - */ - public void setNameIndex( final int nameIndex ) { - this.nameIndex = nameIndex; - } - - - /** @return String object - */ - @Override - public Object getConstantValue( final ConstantPool cp ) { - final Constant c = cp.getConstant(nameIndex, Const.CONSTANT_Utf8); - return ((ConstantUtf8) c).getBytes(); - } - - - /** @return dereferenced string - */ - public String getBytes( final ConstantPool cp ) { - return (String) getConstantValue(cp); - } - - - /** - * @return String representation. - */ - @Override - public String toString() { - return super.toString() + "(nameIndex = " + nameIndex + ")"; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantNameAndType.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantNameAndType.java deleted file mode 100644 index 01982ea5..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantNameAndType.java +++ /dev/null @@ -1,150 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * This class is derived from the abstract {@link Constant} - * and represents a reference to the name and signature - * of a field or method. - * - * @see Constant - */ -public final class ConstantNameAndType extends Constant { - - private int nameIndex; // Name of field/method - private int signatureIndex; // and its signature. - - - /** - * Initialize from another object. - */ - public ConstantNameAndType(final ConstantNameAndType c) { - this(c.getNameIndex(), c.getSignatureIndex()); - } - - - /** - * Initialize instance from file data. - * - * @param file Input stream - * @throws IOException - */ - ConstantNameAndType(final DataInput file) throws IOException { - this(file.readUnsignedShort(), file.readUnsignedShort()); - } - - - /** - * @param nameIndex Name of field/method - * @param signatureIndex and its signature - */ - public ConstantNameAndType(final int nameIndex, final int signatureIndex) { - super(Const.CONSTANT_NameAndType); - this.nameIndex = nameIndex; - this.signatureIndex = signatureIndex; - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitely - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitConstantNameAndType(this); - } - - - /** - * Dump name and signature index to file stream in binary format. - * - * @param file Output file stream - * @throws IOException - */ - @Override - public void dump( final DataOutputStream file ) throws IOException { - file.writeByte(super.getTag()); - file.writeShort(nameIndex); - file.writeShort(signatureIndex); - } - - - /** - * @return Name index in constant pool of field/method name. - */ - public int getNameIndex() { - return nameIndex; - } - - - /** @return name - */ - public String getName( final ConstantPool cp ) { - return cp.constantToString(getNameIndex(), Const.CONSTANT_Utf8); - } - - - /** - * @return Index in constant pool of field/method signature. - */ - public int getSignatureIndex() { - return signatureIndex; - } - - - /** @return signature - */ - public String getSignature( final ConstantPool cp ) { - return cp.constantToString(getSignatureIndex(), Const.CONSTANT_Utf8); - } - - - /** - * @param nameIndex the name index of this constant - */ - public void setNameIndex( final int nameIndex ) { - this.nameIndex = nameIndex; - } - - - /** - * @param signatureIndex the signature index in the constant pool of this type - */ - public void setSignatureIndex( final int signatureIndex ) { - this.signatureIndex = signatureIndex; - } - - - /** - * @return String representation - */ - @Override - public String toString() { - return super.toString() + "(nameIndex = " + nameIndex + ", signatureIndex = " - + signatureIndex + ")"; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantObject.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantObject.java deleted file mode 100644 index feb2f52d..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantObject.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -/** - * This interface denotes those constants that have a "natural" value, - * such as ConstantLong, ConstantString, etc.. - * - * @see Constant - */ -public interface ConstantObject { - - /** @return object representing the constant, e.g., Long for ConstantLong - */ - Object getConstantValue( ConstantPool cp ); -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantPackage.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantPackage.java deleted file mode 100644 index 3f94c749..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantPackage.java +++ /dev/null @@ -1,134 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * This class is derived from the abstract {@link Constant} - * and represents a reference to a package. - * - *

Note: Early access Java 9 support- currently subject to change

- * - * @see Constant - * @since 6.1 - */ -public final class ConstantPackage extends Constant implements ConstantObject { - - private int nameIndex; - - - /** - * Initialize from another object. - */ - public ConstantPackage(final ConstantPackage c) { - this(c.getNameIndex()); - } - - - /** - * Initialize instance from file data. - * - * @param file Input stream - * @throws IOException - */ - ConstantPackage(final DataInput file) throws IOException { - this(file.readUnsignedShort()); - } - - - /** - * @param nameIndex Name index in constant pool. Should refer to a - * ConstantUtf8. - */ - public ConstantPackage(final int nameIndex) { - super(Const.CONSTANT_Package); - this.nameIndex = nameIndex; - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitly - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitConstantPackage(this); - } - - - /** - * Dump constant package to file stream in binary format. - * - * @param file Output file stream - * @throws IOException - */ - @Override - public void dump( final DataOutputStream file ) throws IOException { - file.writeByte(super.getTag()); - file.writeShort(nameIndex); - } - - - /** - * @return Name index in constant pool of package name. - */ - public int getNameIndex() { - return nameIndex; - } - - - /** - * @param nameIndex the name index in the constant pool of this Constant Package - */ - public void setNameIndex( final int nameIndex ) { - this.nameIndex = nameIndex; - } - - - /** @return String object - */ - @Override - public Object getConstantValue( final ConstantPool cp ) { - final Constant c = cp.getConstant(nameIndex, Const.CONSTANT_Utf8); - return ((ConstantUtf8) c).getBytes(); - } - - - /** @return dereferenced string - */ - public String getBytes( final ConstantPool cp ) { - return (String) getConstantValue(cp); - } - - - /** - * @return String representation. - */ - @Override - public String toString() { - return super.toString() + "(nameIndex = " + nameIndex + ")"; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantPool.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantPool.java deleted file mode 100644 index c2926c08..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantPool.java +++ /dev/null @@ -1,376 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * This class represents the constant pool, i.e., a table of constants, of - * a parsed classfile. It may contain null references, due to the JVM - * specification that skips an entry after an 8-byte constant (double, - * long) entry. Those interested in generating constant pools - * programatically should see - * ConstantPoolGen. - - * @see Constant - * @see org.apache.bcel.generic.ConstantPoolGen - */ -public class ConstantPool implements Cloneable, Node { - - private Constant[] constantPool; - - /** - * @param constantPool Array of constants - */ - public ConstantPool(final Constant[] constantPool) { - this.constantPool = constantPool; - } - - /** - * Reads constants from given input stream. - * - * @param input Input stream - * @throws IOException - * @throws ClassFormatException - */ - public ConstantPool(final DataInput input) throws IOException, ClassFormatException { - byte tag; - final int constant_pool_count = input.readUnsignedShort(); - constantPool = new Constant[constant_pool_count]; - /* constantPool[0] is unused by the compiler and may be used freely - * by the implementation. - */ - for (int i = 1; i < constant_pool_count; i++) { - constantPool[i] = Constant.readConstant(input); - /* Quote from the JVM specification: - * "All eight byte constants take up two spots in the constant pool. - * If this is the n'th byte in the constant pool, then the next item - * will be numbered n+2" - * - * Thus we have to increment the index counter. - */ - tag = constantPool[i].getTag(); - if ((tag == Const.CONSTANT_Double) || (tag == Const.CONSTANT_Long)) { - i++; - } - } - } - - /** - * Called by objects that are traversing the nodes of the tree implicitely - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitConstantPool(this); - } - - /** - * Resolves constant to a string representation. - * - * @param c Constant to be printed - * @return String representation - */ - public String constantToString( Constant c ) throws ClassFormatException { - String str; - int i; - final byte tag = c.getTag(); - switch (tag) { - case Const.CONSTANT_Class: - i = ((ConstantClass) c).getNameIndex(); - c = getConstant(i, Const.CONSTANT_Utf8); - str = Utility.compactClassName(((ConstantUtf8) c).getBytes(), false); - break; - case Const.CONSTANT_String: - i = ((ConstantString) c).getStringIndex(); - c = getConstant(i, Const.CONSTANT_Utf8); - str = "\"" + escape(((ConstantUtf8) c).getBytes()) + "\""; - break; - case Const.CONSTANT_Utf8: - str = ((ConstantUtf8) c).getBytes(); - break; - case Const.CONSTANT_Double: - str = String.valueOf(((ConstantDouble) c).getBytes()); - break; - case Const.CONSTANT_Float: - str = String.valueOf(((ConstantFloat) c).getBytes()); - break; - case Const.CONSTANT_Long: - str = String.valueOf(((ConstantLong) c).getBytes()); - break; - case Const.CONSTANT_Integer: - str = String.valueOf(((ConstantInteger) c).getBytes()); - break; - case Const.CONSTANT_NameAndType: - str = constantToString(((ConstantNameAndType) c).getNameIndex(), - Const.CONSTANT_Utf8) - + " " + constantToString(((ConstantNameAndType) c).getSignatureIndex(), - Const.CONSTANT_Utf8); - break; - case Const.CONSTANT_InterfaceMethodref: - case Const.CONSTANT_Methodref: - case Const.CONSTANT_Fieldref: - str = constantToString(((ConstantCP) c).getClassIndex(), Const.CONSTANT_Class) - + "." + constantToString(((ConstantCP) c).getNameAndTypeIndex(), - Const.CONSTANT_NameAndType); - break; - case Const.CONSTANT_MethodHandle: - // Note that the ReferenceIndex may point to a Fieldref, Methodref or - // InterfaceMethodref - so we need to peek ahead to get the actual type. - final ConstantMethodHandle cmh = (ConstantMethodHandle) c; - str = Const.getMethodHandleName(cmh.getReferenceKind()) - + " " + constantToString(cmh.getReferenceIndex(), - getConstant(cmh.getReferenceIndex()).getTag()); - break; - case Const.CONSTANT_MethodType: - final ConstantMethodType cmt = (ConstantMethodType) c; - str = constantToString(cmt.getDescriptorIndex(), Const.CONSTANT_Utf8); - break; - case Const.CONSTANT_InvokeDynamic: - final ConstantInvokeDynamic cid = (ConstantInvokeDynamic) c; - str = cid.getBootstrapMethodAttrIndex() - + ":" + constantToString(cid.getNameAndTypeIndex(), - Const.CONSTANT_NameAndType); - break; - case Const.CONSTANT_Module: - i = ((ConstantModule) c).getNameIndex(); - c = getConstant(i, Const.CONSTANT_Utf8); - str = Utility.compactClassName(((ConstantUtf8) c).getBytes(), false); - break; - case Const.CONSTANT_Package: - i = ((ConstantPackage) c).getNameIndex(); - c = getConstant(i, Const.CONSTANT_Utf8); - str = Utility.compactClassName(((ConstantUtf8) c).getBytes(), false); - break; - default: // Never reached - throw new IllegalArgumentException("Unknown constant type " + tag); - } - return str; - } - - private static String escape( final String str ) { - final int len = str.length(); - final StringBuilder buf = new StringBuilder(len + 5); - final char[] ch = str.toCharArray(); - for (int i = 0; i < len; i++) { - switch (ch[i]) { - case '\n': - buf.append("\\n"); - break; - case '\r': - buf.append("\\r"); - break; - case '\t': - buf.append("\\t"); - break; - case '\b': - buf.append("\\b"); - break; - case '"': - buf.append("\\\""); - break; - default: - buf.append(ch[i]); - } - } - return buf.toString(); - } - - /** - * Retrieves constant at `index' from constant pool and resolve it to - * a string representation. - * - * @param index of constant in constant pool - * @param tag expected type - * @return String representation - */ - public String constantToString( final int index, final byte tag ) throws ClassFormatException { - final Constant c = getConstant(index, tag); - return constantToString(c); - } - - /** - * Dump constant pool to file stream in binary format. - * - * @param file Output file stream - * @throws IOException - */ - public void dump( final DataOutputStream file ) throws IOException { - file.writeShort(constantPool.length); - for (int i = 1; i < constantPool.length; i++) { - if (constantPool[i] != null) { - constantPool[i].dump(file); - } - } - } - - /** - * Gets constant from constant pool. - * - * @param index Index in constant pool - * @return Constant value - * @see Constant - */ - public Constant getConstant( final int index ) { - if (index >= constantPool.length || index < 0) { - throw new ClassFormatException("Invalid constant pool reference: " + index - + ". Constant pool size is: " + constantPool.length); - } - return constantPool[index]; - } - - /** - * Gets constant from constant pool and check whether it has the - * expected type. - * - * @param index Index in constant pool - * @param tag Tag of expected constant, i.e., its type - * @return Constant value - * @see Constant - * @throws ClassFormatException - */ - public Constant getConstant( final int index, final byte tag ) throws ClassFormatException { - Constant c; - c = getConstant(index); - if (c == null) { - throw new ClassFormatException("Constant pool at index " + index + " is null."); - } - if (c.getTag() != tag) { - throw new ClassFormatException("Expected class `" + Const.getConstantName(tag) - + "' at index " + index + " and got " + c); - } - return c; - } - - /** - * @return Array of constants. - * @see Constant - */ - public Constant[] getConstantPool() { - return constantPool; - } - - /** - * Gets string from constant pool and bypass the indirection of - * `ConstantClass' and `ConstantString' objects. I.e. these classes have - * an index field that points to another entry of the constant pool of - * type `ConstantUtf8' which contains the real data. - * - * @param index Index in constant pool - * @param tag Tag of expected constant, either ConstantClass or ConstantString - * @return Contents of string reference - * @see ConstantClass - * @see ConstantString - * @throws ClassFormatException - */ - public String getConstantString( final int index, final byte tag ) throws ClassFormatException { - Constant c; - int i; - c = getConstant(index, tag); - /* This switch() is not that elegant, since the four classes have the - * same contents, they just differ in the name of the index - * field variable. - * But we want to stick to the JVM naming conventions closely though - * we could have solved these more elegantly by using the same - * variable name or by subclassing. - */ - switch (tag) { - case Const.CONSTANT_Class: - i = ((ConstantClass) c).getNameIndex(); - break; - case Const.CONSTANT_String: - i = ((ConstantString) c).getStringIndex(); - break; - case Const.CONSTANT_Module: - i = ((ConstantModule) c).getNameIndex(); - break; - case Const.CONSTANT_Package: - i = ((ConstantPackage) c).getNameIndex(); - break; - default: - throw new IllegalArgumentException("getConstantString called with illegal tag " + tag); - } - // Finally get the string from the constant pool - c = getConstant(i, Const.CONSTANT_Utf8); - return ((ConstantUtf8) c).getBytes(); - } - - - /** - * @return Length of constant pool. - */ - public int getLength() { - return constantPool == null ? 0 : constantPool.length; - } - - - /** - * @param constant Constant to set - */ - public void setConstant( final int index, final Constant constant ) { - constantPool[index] = constant; - } - - - /** - * @param constantPool - */ - public void setConstantPool( final Constant[] constantPool ) { - this.constantPool = constantPool; - } - - - /** - * @return String representation. - */ - @Override - public String toString() { - final StringBuilder buf = new StringBuilder(); - for (int i = 1; i < constantPool.length; i++) { - buf.append(i).append(")").append(constantPool[i]).append("\n"); - } - return buf.toString(); - } - - - /** - * @return deep copy of this constant pool - */ - public ConstantPool copy() { - ConstantPool c = null; - try { - c = (ConstantPool) clone(); - c.constantPool = new Constant[constantPool.length]; - for (int i = 1; i < constantPool.length; i++) { - if (constantPool[i] != null) { - c.constantPool[i] = constantPool[i].copy(); - } - } - } catch (final CloneNotSupportedException e) { - // TODO should this throw? - } - return c; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantString.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantString.java deleted file mode 100644 index e3458d2b..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantString.java +++ /dev/null @@ -1,130 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * This class is derived from the abstract {@link Constant} - * and represents a reference to a String object. - * - * @see Constant - */ -public final class ConstantString extends Constant implements ConstantObject { - - private int stringIndex; // Identical to ConstantClass except for this name - - - /** - * Initialize from another object. - */ - public ConstantString(final ConstantString c) { - this(c.getStringIndex()); - } - - - /** - * Initialize instance from file data. - * - * @param file Input stream - * @throws IOException - */ - ConstantString(final DataInput file) throws IOException { - this(file.readUnsignedShort()); - } - - - /** - * @param stringIndex Index of Constant_Utf8 in constant pool - */ - public ConstantString(final int stringIndex) { - super(Const.CONSTANT_String); - this.stringIndex = stringIndex; - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitely - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitConstantString(this); - } - - - /** - * Dump constant field reference to file stream in binary format. - * - * @param file Output file stream - * @throws IOException - */ - @Override - public void dump( final DataOutputStream file ) throws IOException { - file.writeByte(super.getTag()); - file.writeShort(stringIndex); - } - - - /** - * @return Index in constant pool of the string (ConstantUtf8). - */ - public int getStringIndex() { - return stringIndex; - } - - - /** - * @param stringIndex the index into the constant of the string value - */ - public void setStringIndex( final int stringIndex ) { - this.stringIndex = stringIndex; - } - - - /** - * @return String representation. - */ - @Override - public String toString() { - return super.toString() + "(stringIndex = " + stringIndex + ")"; - } - - - /** @return String object - */ - @Override - public Object getConstantValue( final ConstantPool cp ) { - final Constant c = cp.getConstant(stringIndex, Const.CONSTANT_Utf8); - return ((ConstantUtf8) c).getBytes(); - } - - - /** @return dereferenced string - */ - public String getBytes( final ConstantPool cp ) { - return (String) getConstantValue(cp); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantUtf8.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantUtf8.java deleted file mode 100644 index f421f66a..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantUtf8.java +++ /dev/null @@ -1,267 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.Map; - -import org.apache.bcel.Const; - -/** - * Extends the abstract {@link Constant} to represent a reference to a UTF-8 encoded string. - *

- * The following system properties govern caching this class performs. - *

- *
    - *
  • {@value #SYS_PROP_CACHE_MAX_ENTRIES} (since 6.4): The size of the cache, by default 0, meaning caching is disabled.
    • - *
  • {@value #SYS_PROP_CACHE_MAX_ENTRY_SIZE} (since 6.0): The maximum size of the values to cache, by default 200, 0 disables - * caching. Values larger than this are not cached.
    • - *
  • {@value #SYS_PROP_STATISTICS} (since 6.0): Prints statistics on the console when the JVM exits.
    • - *
- *

- * Here is a sample Maven invocation with caching disabled: - *

- * - * 
- * mvn test -Dbcel.statistics=true -Dbcel.maxcached.size=0 -Dbcel.maxcached=0
- *
- *

- * Here is a sample Maven invocation with caching enabled: - *

- * - * 
- * mvn test -Dbcel.statistics=true -Dbcel.maxcached.size=100000 -Dbcel.maxcached=5000000
- *
- * - * @see Constant - */ -public final class ConstantUtf8 extends Constant { - - private static class Cache { - - private static final boolean BCEL_STATISTICS = Boolean.getBoolean(SYS_PROP_STATISTICS); - private static final int MAX_ENTRIES = Integer.getInteger(SYS_PROP_CACHE_MAX_ENTRIES, 0).intValue(); - private static final int INITIAL_CAPACITY = (int) (MAX_ENTRIES / 0.75); - - private static final HashMap CACHE = new LinkedHashMap( - INITIAL_CAPACITY, 0.75f, true) { - - private static final long serialVersionUID = -8506975356158971766L; - - @Override - protected boolean removeEldestEntry(final Map.Entry eldest) { - return size() > MAX_ENTRIES; - } - }; - - // Set the size to 0 or below to skip caching entirely - private static final int MAX_ENTRY_SIZE = Integer.getInteger(SYS_PROP_CACHE_MAX_ENTRY_SIZE, 200).intValue(); - - static boolean isEnabled() { - return Cache.MAX_ENTRIES > 0 && MAX_ENTRY_SIZE > 0; - } - - } - - // TODO these should perhaps be AtomicInt? - private static volatile int considered = 0; - private static volatile int created = 0; - private static volatile int hits = 0; - private static volatile int skipped = 0; - - private static final String SYS_PROP_CACHE_MAX_ENTRIES = "bcel.maxcached"; - private static final String SYS_PROP_CACHE_MAX_ENTRY_SIZE = "bcel.maxcached.size"; - private static final String SYS_PROP_STATISTICS = "bcel.statistics"; - - static { - if (Cache.BCEL_STATISTICS) { - Runtime.getRuntime().addShutdownHook(new Thread() { - @Override - public void run() { - printStats(); - } - }); - } - } - - /** - * Clears the cache. - * - * @since 6.4.0 - */ - public static synchronized void clearCache() { - Cache.CACHE.clear(); - } - - // for accesss by test code - static synchronized void clearStats() { - hits = considered = skipped = created = 0; - } - - /** - * Gets a new or cached instance of the given value. - *

- * See {@link ConstantUtf8} class Javadoc for details. - *

- * - * @param value the value. - * @return a new or cached instance of the given value. - * @since 6.0 - */ - public static ConstantUtf8 getCachedInstance(final String value) { - if (value.length() > Cache.MAX_ENTRY_SIZE) { - skipped++; - return new ConstantUtf8(value); - } - considered++; - synchronized (ConstantUtf8.class) { // might be better with a specific lock object - ConstantUtf8 result = Cache.CACHE.get(value); - if (result != null) { - hits++; - return result; - } - result = new ConstantUtf8(value); - Cache.CACHE.put(value, result); - return result; - } - } - - /** - * Gets a new or cached instance of the given value. - *

- * See {@link ConstantUtf8} class Javadoc for details. - *

- * - * @param dataInput the value. - * @return a new or cached instance of the given value. - * @throws IOException if an I/O error occurs. - * @since 6.0 - */ - public static ConstantUtf8 getInstance(final DataInput dataInput) throws IOException { - return getInstance(dataInput.readUTF()); - } - - /** - * Gets a new or cached instance of the given value. - *

- * See {@link ConstantUtf8} class Javadoc for details. - *

- * - * @param value the value. - * @return a new or cached instance of the given value. - * @since 6.0 - */ - public static ConstantUtf8 getInstance(final String value) { - return Cache.isEnabled() ? getCachedInstance(value) : new ConstantUtf8(value); - } - - // for accesss by test code - static void printStats() { - final String prefix = "[Apache Commons BCEL]"; - System.err.printf("%s Cache hit %,d/%,d, %d skipped.%n", prefix, hits, considered, skipped); - System.err.printf("%s Total of %,d ConstantUtf8 objects created.%n", prefix, created); - System.err.printf("%s Configuration: %s=%,d, %s=%,d.%n", prefix, SYS_PROP_CACHE_MAX_ENTRIES, Cache.MAX_ENTRIES, - SYS_PROP_CACHE_MAX_ENTRY_SIZE, Cache.MAX_ENTRY_SIZE); - } - - private final String value; - - /** - * Initializes from another object. - * - * @param constantUtf8 the value. - */ - public ConstantUtf8(final ConstantUtf8 constantUtf8) { - this(constantUtf8.getBytes()); - } - - /** - * Initializes instance from file data. - * - * @param dataInput Input stream - * @throws IOException - */ - ConstantUtf8(final DataInput dataInput) throws IOException { - super(Const.CONSTANT_Utf8); - value = dataInput.readUTF(); - created++; - } - - /** - * @param value Data - */ - public ConstantUtf8(final String value) { - super(Const.CONSTANT_Utf8); - if (value == null) { - throw new IllegalArgumentException("Value must not be null."); - } - this.value = value; - created++; - } - - /** - * Called by objects that are traversing the nodes of the tree implicitely defined by the contents of a Java class. - * I.e., the hierarchy of methods, fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept(final Visitor v) { - v.visitConstantUtf8(this); - } - - /** - * Dumps String in Utf8 format to file stream. - * - * @param file Output file stream - * @throws IOException - */ - @Override - public void dump(final DataOutputStream file) throws IOException { - file.writeByte(super.getTag()); - file.writeUTF(value); - } - - /** - * @return Data converted to string. - */ - public String getBytes() { - return value; - } - - /** - * @param bytes the raw bytes of this UTF-8 - * @deprecated (since 6.0) - */ - @java.lang.Deprecated - public void setBytes(final String bytes) { - throw new UnsupportedOperationException(); - } - - /** - * @return String representation - */ - @Override - public String toString() { - return super.toString() + "(\"" + Utility.replace(value, "\n", "\\n") + "\")"; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantValue.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantValue.java deleted file mode 100644 index 0ca63b8e..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ConstantValue.java +++ /dev/null @@ -1,159 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * This class is derived from Attribute and represents a constant - * value, i.e., a default value for initializing a class field. - * This class is instantiated by the Attribute.readAttribute() method. - * - * @see Attribute - */ -public final class ConstantValue extends Attribute { - - private int constantValueIndex; - - - /** - * Initialize from another object. Note that both objects use the same - * references (shallow copy). Use clone() for a physical copy. - */ - public ConstantValue(final ConstantValue c) { - this(c.getNameIndex(), c.getLength(), c.getConstantValueIndex(), c.getConstantPool()); - } - - - /** - * Construct object from input stream. - * @param name_index Name index in constant pool - * @param length Content length in bytes - * @param input Input stream - * @param constant_pool Array of constants - * @throws IOException - */ - ConstantValue(final int name_index, final int length, final DataInput input, final ConstantPool constant_pool) - throws IOException { - this(name_index, length, input.readUnsignedShort(), constant_pool); - } - - - /** - * @param name_index Name index in constant pool - * @param length Content length in bytes - * @param constantValueIndex Index in constant pool - * @param constant_pool Array of constants - */ - public ConstantValue(final int name_index, final int length, final int constantValueIndex, - final ConstantPool constant_pool) { - super(Const.ATTR_CONSTANT_VALUE, name_index, length, constant_pool); - this.constantValueIndex = constantValueIndex; - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitely - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitConstantValue(this); - } - - - /** - * Dump constant value attribute to file stream on binary format. - * - * @param file Output file stream - * @throws IOException - */ - @Override - public void dump( final DataOutputStream file ) throws IOException { - super.dump(file); - file.writeShort(constantValueIndex); - } - - - /** - * @return Index in constant pool of constant value. - */ - public int getConstantValueIndex() { - return constantValueIndex; - } - - - /** - * @param constantValueIndex the index info the constant pool of this constant value - */ - public void setConstantValueIndex( final int constantValueIndex ) { - this.constantValueIndex = constantValueIndex; - } - - - /** - * @return String representation of constant value. - */ - @Override - public String toString() { - Constant c = super.getConstantPool().getConstant(constantValueIndex); - String buf; - int i; - // Print constant to string depending on its type - switch (c.getTag()) { - case Const.CONSTANT_Long: - buf = String.valueOf(((ConstantLong) c).getBytes()); - break; - case Const.CONSTANT_Float: - buf = String.valueOf(((ConstantFloat) c).getBytes()); - break; - case Const.CONSTANT_Double: - buf = String.valueOf(((ConstantDouble) c).getBytes()); - break; - case Const.CONSTANT_Integer: - buf = String.valueOf(((ConstantInteger) c).getBytes()); - break; - case Const.CONSTANT_String: - i = ((ConstantString) c).getStringIndex(); - c = super.getConstantPool().getConstant(i, Const.CONSTANT_Utf8); - buf = "\"" + Utility.convertString(((ConstantUtf8) c).getBytes()) + "\""; - break; - default: - throw new IllegalStateException("Type of ConstValue invalid: " + c); - } - return buf; - } - - - /** - * @return deep copy of this attribute - */ - @Override - public Attribute copy( final ConstantPool _constant_pool ) { - final ConstantValue c = (ConstantValue) clone(); - c.setConstantPool(_constant_pool); - return c; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/Deprecated.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/Deprecated.java deleted file mode 100644 index 0b67e86e..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/Deprecated.java +++ /dev/null @@ -1,145 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * This class is derived from Attribute and denotes that this is a - * deprecated method. - * It is instantiated from the Attribute.readAttribute() method. - * - * @see Attribute - */ -public final class Deprecated extends Attribute { - - private byte[] bytes; - - - /** - * Initialize from another object. Note that both objects use the same - * references (shallow copy). Use clone() for a physical copy. - */ - public Deprecated(final Deprecated c) { - this(c.getNameIndex(), c.getLength(), c.getBytes(), c.getConstantPool()); - } - - - /** - * @param name_index Index in constant pool to CONSTANT_Utf8 - * @param length Content length in bytes - * @param bytes Attribute contents - * @param constant_pool Array of constants - */ - public Deprecated(final int name_index, final int length, final byte[] bytes, final ConstantPool constant_pool) { - super(Const.ATTR_DEPRECATED, name_index, length, constant_pool); - this.bytes = bytes; - } - - - /** - * Construct object from input stream. - * - * @param name_index Index in constant pool to CONSTANT_Utf8 - * @param length Content length in bytes - * @param input Input stream - * @param constant_pool Array of constants - * @throws IOException - */ - Deprecated(final int name_index, final int length, final DataInput input, final ConstantPool constant_pool) - throws IOException { - this(name_index, length, (byte[]) null, constant_pool); - if (length > 0) { - bytes = new byte[length]; - input.readFully(bytes); - println("Deprecated attribute with length > 0"); - } - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitely - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitDeprecated(this); - } - - - /** - * Dump source file attribute to file stream in binary format. - * - * @param file Output file stream - * @throws IOException - */ - @Override - public void dump( final DataOutputStream file ) throws IOException { - super.dump(file); - if (super.getLength() > 0) { - file.write(bytes, 0, super.getLength()); - } - } - - - /** - * @return data bytes. - */ - public byte[] getBytes() { - return bytes; - } - - - /** - * @param bytes the raw bytes that represents this byte array - */ - public void setBytes( final byte[] bytes ) { - this.bytes = bytes; - } - - - /** - * @return attribute name - */ - @Override - public String toString() { - return Const.getAttributeName(Const.ATTR_DEPRECATED); - } - - - /** - * @return deep copy of this attribute - */ - @Override - public Attribute copy( final ConstantPool _constant_pool ) { - final Deprecated c = (Deprecated) clone(); - if (bytes != null) { - c.bytes = new byte[bytes.length]; - System.arraycopy(bytes, 0, c.bytes, 0, bytes.length); - } - c.setConstantPool(_constant_pool); - return c; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/DescendingVisitor.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/DescendingVisitor.java deleted file mode 100644 index a1eb096f..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/DescendingVisitor.java +++ /dev/null @@ -1,656 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.util.Stack; - -/** - * Traverses a JavaClass with another Visitor object 'piggy-backed' that is - * applied to all components of a JavaClass object. I.e. this class supplies the - * traversal strategy, other classes can make use of it. - * - */ -public class DescendingVisitor implements Visitor -{ - private final JavaClass clazz; - - private final Visitor visitor; - - private final Stack stack = new Stack<>(); - - /** - * @return container of current entitity, i.e., predecessor during traversal - */ - public Object predecessor() - { - return predecessor(0); - } - - /** - * @param level - * nesting level, i.e., 0 returns the direct predecessor - * @return container of current entitity, i.e., predecessor during traversal - */ - public Object predecessor(final int level) - { - final int size = stack.size(); - if ((size < 2) || (level < 0)) - { - return null; - } - return stack.elementAt(size - (level + 2)); // size - 1 == current - } - - /** - * @return current object - */ - public Object current() - { - return stack.peek(); - } - - /** - * @param clazz - * Class to traverse - * @param visitor - * visitor object to apply to all components - */ - public DescendingVisitor(final JavaClass clazz, final Visitor visitor) - { - this.clazz = clazz; - this.visitor = visitor; - } - - /** - * Start traversal. - */ - public void visit() - { - clazz.accept(this); - } - - @Override - public void visitJavaClass(final JavaClass _clazz) - { - stack.push(_clazz); - _clazz.accept(visitor); - final Field[] fields = _clazz.getFields(); - for (final Field field : fields) { - field.accept(this); - } - final Method[] methods = _clazz.getMethods(); - for (final Method method : methods) { - method.accept(this); - } - final Attribute[] attributes = _clazz.getAttributes(); - for (final Attribute attribute : attributes) { - attribute.accept(this); - } - _clazz.getConstantPool().accept(this); - stack.pop(); - } - - /** - * @since 6.0 - */ - @Override - public void visitAnnotation(final Annotations annotation) - { - stack.push(annotation); - annotation.accept(visitor); - final AnnotationEntry[] entries = annotation.getAnnotationEntries(); - for (final AnnotationEntry entrie : entries) { - entrie.accept(this); - } - stack.pop(); - } - - /** - * @since 6.0 - */ - @Override - public void visitAnnotationEntry(final AnnotationEntry annotationEntry) - { - stack.push(annotationEntry); - annotationEntry.accept(visitor); - stack.pop(); - } - - @Override - public void visitField(final Field field) - { - stack.push(field); - field.accept(visitor); - final Attribute[] attributes = field.getAttributes(); - for (final Attribute attribute : attributes) { - attribute.accept(this); - } - stack.pop(); - } - - @Override - public void visitConstantValue(final ConstantValue cv) - { - stack.push(cv); - cv.accept(visitor); - stack.pop(); - } - - @Override - public void visitMethod(final Method method) - { - stack.push(method); - method.accept(visitor); - final Attribute[] attributes = method.getAttributes(); - for (final Attribute attribute : attributes) { - attribute.accept(this); - } - stack.pop(); - } - - @Override - public void visitExceptionTable(final ExceptionTable table) - { - stack.push(table); - table.accept(visitor); - stack.pop(); - } - - @Override - public void visitCode(final Code code) - { - stack.push(code); - code.accept(visitor); - final CodeException[] table = code.getExceptionTable(); - for (final CodeException element : table) { - element.accept(this); - } - final Attribute[] attributes = code.getAttributes(); - for (final Attribute attribute : attributes) { - attribute.accept(this); - } - stack.pop(); - } - - @Override - public void visitCodeException(final CodeException ce) - { - stack.push(ce); - ce.accept(visitor); - stack.pop(); - } - - @Override - public void visitLineNumberTable(final LineNumberTable table) - { - stack.push(table); - table.accept(visitor); - final LineNumber[] numbers = table.getLineNumberTable(); - for (final LineNumber number : numbers) { - number.accept(this); - } - stack.pop(); - } - - @Override - public void visitLineNumber(final LineNumber number) - { - stack.push(number); - number.accept(visitor); - stack.pop(); - } - - @Override - public void visitLocalVariableTable(final LocalVariableTable table) - { - stack.push(table); - table.accept(visitor); - final LocalVariable[] vars = table.getLocalVariableTable(); - for (final LocalVariable var : vars) { - var.accept(this); - } - stack.pop(); - } - - @Override - public void visitStackMap(final StackMap table) - { - stack.push(table); - table.accept(visitor); - final StackMapEntry[] vars = table.getStackMap(); - for (final StackMapEntry var : vars) { - var.accept(this); - } - stack.pop(); - } - - @Override - public void visitStackMapEntry(final StackMapEntry var) - { - stack.push(var); - var.accept(visitor); - stack.pop(); - } - - @Override - public void visitLocalVariable(final LocalVariable var) - { - stack.push(var); - var.accept(visitor); - stack.pop(); - } - - @Override - public void visitConstantPool(final ConstantPool cp) - { - stack.push(cp); - cp.accept(visitor); - final Constant[] constants = cp.getConstantPool(); - for (int i = 1; i < constants.length; i++) - { - if (constants[i] != null) - { - constants[i].accept(this); - } - } - stack.pop(); - } - - @Override - public void visitConstantClass(final ConstantClass constant) - { - stack.push(constant); - constant.accept(visitor); - stack.pop(); - } - - @Override - public void visitConstantDouble(final ConstantDouble constant) - { - stack.push(constant); - constant.accept(visitor); - stack.pop(); - } - - @Override - public void visitConstantFieldref(final ConstantFieldref constant) - { - stack.push(constant); - constant.accept(visitor); - stack.pop(); - } - - @Override - public void visitConstantFloat(final ConstantFloat constant) - { - stack.push(constant); - constant.accept(visitor); - stack.pop(); - } - - @Override - public void visitConstantInteger(final ConstantInteger constant) - { - stack.push(constant); - constant.accept(visitor); - stack.pop(); - } - - @Override - public void visitConstantInterfaceMethodref( - final ConstantInterfaceMethodref constant) - { - stack.push(constant); - constant.accept(visitor); - stack.pop(); - } - - /** - * @since 6.0 - */ - @Override - public void visitConstantInvokeDynamic( - final ConstantInvokeDynamic constant) - { - stack.push(constant); - constant.accept(visitor); - stack.pop(); - } - - @Override - public void visitConstantLong(final ConstantLong constant) - { - stack.push(constant); - constant.accept(visitor); - stack.pop(); - } - - @Override - public void visitConstantMethodref(final ConstantMethodref constant) - { - stack.push(constant); - constant.accept(visitor); - stack.pop(); - } - - @Override - public void visitConstantNameAndType(final ConstantNameAndType constant) - { - stack.push(constant); - constant.accept(visitor); - stack.pop(); - } - - @Override - public void visitConstantString(final ConstantString constant) - { - stack.push(constant); - constant.accept(visitor); - stack.pop(); - } - - @Override - public void visitConstantUtf8(final ConstantUtf8 constant) - { - stack.push(constant); - constant.accept(visitor); - stack.pop(); - } - - @Override - public void visitInnerClasses(final InnerClasses ic) - { - stack.push(ic); - ic.accept(visitor); - final InnerClass[] ics = ic.getInnerClasses(); - for (final InnerClass ic2 : ics) { - ic2.accept(this); - } - stack.pop(); - } - - @Override - public void visitInnerClass(final InnerClass inner) - { - stack.push(inner); - inner.accept(visitor); - stack.pop(); - } - - /** - * @since 6.0 - */ - @Override - public void visitBootstrapMethods(final BootstrapMethods bm) - { - stack.push(bm); - bm.accept(visitor); - // BootstrapMethod[] bms = bm.getBootstrapMethods(); - // for (int i = 0; i < bms.length; i++) - // { - // bms[i].accept(this); - // } - stack.pop(); - } - - @Override - public void visitDeprecated(final Deprecated attribute) - { - stack.push(attribute); - attribute.accept(visitor); - stack.pop(); - } - - @Override - public void visitSignature(final Signature attribute) - { - stack.push(attribute); - attribute.accept(visitor); - stack.pop(); - } - - @Override - public void visitSourceFile(final SourceFile attribute) - { - stack.push(attribute); - attribute.accept(visitor); - stack.pop(); - } - - @Override - public void visitSynthetic(final Synthetic attribute) - { - stack.push(attribute); - attribute.accept(visitor); - stack.pop(); - } - - @Override - public void visitUnknown(final Unknown attribute) - { - stack.push(attribute); - attribute.accept(visitor); - stack.pop(); - } - - /** - * @since 6.0 - */ - @Override - public void visitAnnotationDefault(final AnnotationDefault obj) - { - stack.push(obj); - obj.accept(visitor); - stack.pop(); - } - - /** - * @since 6.0 - */ - @Override - public void visitEnclosingMethod(final EnclosingMethod obj) - { - stack.push(obj); - obj.accept(visitor); - stack.pop(); - } - - /** - * @since 6.0 - */ - @Override - public void visitLocalVariableTypeTable(final LocalVariableTypeTable obj) - { - stack.push(obj); - obj.accept(visitor); - stack.pop(); - } - - /** - * @since 6.0 - */ - @Override - public void visitParameterAnnotation(final ParameterAnnotations obj) - { - stack.push(obj); - obj.accept(visitor); - stack.pop(); - } - - /** - * @since 6.0 - */ - @Override - public void visitMethodParameters(final MethodParameters obj) - { - stack.push(obj); - obj.accept(visitor); - final MethodParameter[] table = obj.getParameters(); - for (final MethodParameter element : table) { - element.accept(this); - } - stack.pop(); - } - - /** - * @since 6.4.0 - */ - @Override - public void visitMethodParameter(final MethodParameter obj) - { - stack.push(obj); - obj.accept(visitor); - stack.pop(); - } - - /** @since 6.0 */ - @Override - public void visitConstantMethodType(final ConstantMethodType obj) { - stack.push(obj); - obj.accept(visitor); - stack.pop(); - } - - /** @since 6.0 */ - @Override - public void visitConstantMethodHandle(final ConstantMethodHandle obj) { - stack.push(obj); - obj.accept(visitor); - stack.pop(); - } - - /** @since 6.0 */ - @Override - public void visitParameterAnnotationEntry(final ParameterAnnotationEntry obj) { - stack.push(obj); - obj.accept(visitor); - stack.pop(); - } - - /** @since 6.1 */ - @Override - public void visitConstantPackage(final ConstantPackage obj) { - stack.push(obj); - obj.accept(visitor); - stack.pop(); - } - - /** @since 6.1 */ - @Override - public void visitConstantModule(final ConstantModule obj) { - stack.push(obj); - obj.accept(visitor); - stack.pop(); - } - - /** @since 6.3 */ - @Override - public void visitConstantDynamic(final ConstantDynamic obj) { - stack.push(obj); - obj.accept(visitor); - stack.pop(); - } - - /** @since 6.4.0 */ - @Override - public void visitModule(final Module obj) { - stack.push(obj); - obj.accept(visitor); - final ModuleRequires[] rtable = obj.getRequiresTable(); - for (final ModuleRequires element : rtable) { - element.accept(this); - } - final ModuleExports[] etable = obj.getExportsTable(); - for (final ModuleExports element : etable) { - element.accept(this); - } - final ModuleOpens[] otable = obj.getOpensTable(); - for (final ModuleOpens element : otable) { - element.accept(this); - } - final ModuleProvides[] ptable = obj.getProvidesTable(); - for (final ModuleProvides element : ptable) { - element.accept(this); - } - stack.pop(); - } - - /** @since 6.4.0 */ - @Override - public void visitModuleRequires(final ModuleRequires obj) { - stack.push(obj); - obj.accept(visitor); - stack.pop(); - } - - /** @since 6.4.0 */ - @Override - public void visitModuleExports(final ModuleExports obj) { - stack.push(obj); - obj.accept(visitor); - stack.pop(); - } - - /** @since 6.4.0 */ - @Override - public void visitModuleOpens(final ModuleOpens obj) { - stack.push(obj); - obj.accept(visitor); - stack.pop(); - } - - /** @since 6.4.0 */ - @Override - public void visitModuleProvides(final ModuleProvides obj) { - stack.push(obj); - obj.accept(visitor); - stack.pop(); - } - - /** @since 6.4.0 */ - @Override - public void visitModulePackages(final ModulePackages obj) { - stack.push(obj); - obj.accept(visitor); - stack.pop(); - } - - /** @since 6.4.0 */ - @Override - public void visitModuleMainClass(final ModuleMainClass obj) { - stack.push(obj); - obj.accept(visitor); - stack.pop(); - } - - /** @since 6.4.0 */ - @Override - public void visitNestHost(final NestHost obj) { - stack.push(obj); - obj.accept(visitor); - stack.pop(); - } - - /** @since 6.4.0 */ - @Override - public void visitNestMembers(final NestMembers obj) { - stack.push(obj); - obj.accept(visitor); - stack.pop(); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ElementValue.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ElementValue.java deleted file mode 100644 index b96a97ff..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ElementValue.java +++ /dev/null @@ -1,130 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -/** - * @since 6.0 - */ -public abstract class ElementValue -{ - /** - * @deprecated (since 6.0) will be made private and final; do not access directly, use getter - */ - @java.lang.Deprecated - protected int type; // TODO should be final - - /** - * @deprecated (since 6.0) will be made private and final; do not access directly, use getter - */ - @java.lang.Deprecated - protected ConstantPool cpool; // TODO should be final - - @Override - public String toString() - { - return stringifyValue(); - } - - protected ElementValue(final int type, final ConstantPool cpool) - { - this.type = type; - this.cpool = cpool; - } - - public int getElementValueType() - { - return type; - } - - public abstract String stringifyValue(); - - public abstract void dump(DataOutputStream dos) throws IOException; - - public static final byte STRING = 's'; - public static final byte ENUM_CONSTANT = 'e'; - public static final byte CLASS = 'c'; - public static final byte ANNOTATION = '@'; - public static final byte ARRAY = '['; - public static final byte PRIMITIVE_INT = 'I'; - public static final byte PRIMITIVE_BYTE = 'B'; - public static final byte PRIMITIVE_CHAR = 'C'; - public static final byte PRIMITIVE_DOUBLE = 'D'; - public static final byte PRIMITIVE_FLOAT = 'F'; - public static final byte PRIMITIVE_LONG = 'J'; - public static final byte PRIMITIVE_SHORT = 'S'; - public static final byte PRIMITIVE_BOOLEAN = 'Z'; - - public static ElementValue readElementValue(final DataInput input, final ConstantPool cpool) throws IOException - { - final byte type = input.readByte(); - switch (type) - { - case PRIMITIVE_BYTE: - case PRIMITIVE_CHAR: - case PRIMITIVE_DOUBLE: - case PRIMITIVE_FLOAT: - case PRIMITIVE_INT: - case PRIMITIVE_LONG: - case PRIMITIVE_SHORT: - case PRIMITIVE_BOOLEAN: - case STRING: - return new SimpleElementValue(type, input.readUnsignedShort(), cpool); - - case ENUM_CONSTANT: - return new EnumElementValue(ENUM_CONSTANT, input.readUnsignedShort(), input.readUnsignedShort(), cpool); - - case CLASS: - return new ClassElementValue(CLASS, input.readUnsignedShort(), cpool); - - case ANNOTATION: - // TODO isRuntimeVisible - return new AnnotationElementValue(ANNOTATION, AnnotationEntry.read(input, cpool, false), cpool); - - case ARRAY: - final int numArrayVals = input.readUnsignedShort(); - final ElementValue[] evalues = new ElementValue[numArrayVals]; - for (int j = 0; j < numArrayVals; j++) - { - evalues[j] = ElementValue.readElementValue(input, cpool); - } - return new ArrayElementValue(ARRAY, evalues, cpool); - - default: - throw new IllegalArgumentException("Unexpected element value kind in annotation: " + type); - } - } - - /** @since 6.0 */ - final ConstantPool getConstantPool() { - return cpool; - } - - /** @since 6.0 */ - final int getType() { - return type; - } - - public String toShortString() - { - return stringifyValue(); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ElementValuePair.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ElementValuePair.java deleted file mode 100644 index c2e543dc..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ElementValuePair.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * an annotation's element value pair - * - * @since 6.0 - */ -public class ElementValuePair -{ - private final ElementValue elementValue; - - private final ConstantPool constantPool; - - private final int elementNameIndex; - - public ElementValuePair(final int elementNameIndex, final ElementValue elementValue, - final ConstantPool constantPool) - { - this.elementValue = elementValue; - this.elementNameIndex = elementNameIndex; - this.constantPool = constantPool; - } - - public String getNameString() - { - final ConstantUtf8 c = (ConstantUtf8) constantPool.getConstant( - elementNameIndex, Const.CONSTANT_Utf8); - return c.getBytes(); - } - - public final ElementValue getValue() - { - return elementValue; - } - - public int getNameIndex() - { - return elementNameIndex; - } - - public String toShortString() - { - final StringBuilder result = new StringBuilder(); - result.append(getNameString()).append("=").append( - getValue().toShortString()); - return result.toString(); - } - - protected void dump(final DataOutputStream dos) throws IOException { - dos.writeShort(elementNameIndex); // u2 name of the element - elementValue.dump(dos); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/EmptyVisitor.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/EmptyVisitor.java deleted file mode 100644 index 3955ff7b..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/EmptyVisitor.java +++ /dev/null @@ -1,372 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -/** - * Visitor with empty method bodies, can be extended and used in conjunction - * with the DescendingVisitor class, e.g. By courtesy of David Spencer. - * - * @see DescendingVisitor - */ -public class EmptyVisitor implements Visitor -{ - protected EmptyVisitor() - { - } - - /** - * @since 6.0 - */ - @Override - public void visitAnnotation(final Annotations obj) - { - } - - /** - * @since 6.0 - */ - @Override - public void visitParameterAnnotation(final ParameterAnnotations obj) - { - } - - /** - * @since 6.0 - */ - @Override - public void visitAnnotationEntry(final AnnotationEntry obj) - { - } - - /** - * @since 6.0 - */ - @Override - public void visitAnnotationDefault(final AnnotationDefault obj) - { - } - - @Override - public void visitCode(final Code obj) - { - } - - @Override - public void visitCodeException(final CodeException obj) - { - } - - @Override - public void visitConstantClass(final ConstantClass obj) - { - } - - @Override - public void visitConstantDouble(final ConstantDouble obj) - { - } - - @Override - public void visitConstantFieldref(final ConstantFieldref obj) - { - } - - @Override - public void visitConstantFloat(final ConstantFloat obj) - { - } - - @Override - public void visitConstantInteger(final ConstantInteger obj) - { - } - - @Override - public void visitConstantInterfaceMethodref(final ConstantInterfaceMethodref obj) - { - } - - @Override - public void visitConstantInvokeDynamic(final ConstantInvokeDynamic obj) - { - } - - @Override - public void visitConstantLong(final ConstantLong obj) - { - } - - @Override - public void visitConstantMethodref(final ConstantMethodref obj) - { - } - - @Override - public void visitConstantNameAndType(final ConstantNameAndType obj) - { - } - - @Override - public void visitConstantPool(final ConstantPool obj) - { - } - - @Override - public void visitConstantString(final ConstantString obj) - { - } - - @Override - public void visitConstantUtf8(final ConstantUtf8 obj) - { - } - - @Override - public void visitConstantValue(final ConstantValue obj) - { - } - - @Override - public void visitDeprecated(final Deprecated obj) - { - } - - @Override - public void visitExceptionTable(final ExceptionTable obj) - { - } - - @Override - public void visitField(final Field obj) - { - } - - @Override - public void visitInnerClass(final InnerClass obj) - { - } - - @Override - public void visitInnerClasses(final InnerClasses obj) - { - } - - /** - * @since 6.0 - */ - @Override - public void visitBootstrapMethods(final BootstrapMethods obj) - { - } - - @Override - public void visitJavaClass(final JavaClass obj) - { - } - - @Override - public void visitLineNumber(final LineNumber obj) - { - } - - @Override - public void visitLineNumberTable(final LineNumberTable obj) - { - } - - @Override - public void visitLocalVariable(final LocalVariable obj) - { - } - - @Override - public void visitLocalVariableTable(final LocalVariableTable obj) - { - } - - @Override - public void visitMethod(final Method obj) - { - } - - @Override - public void visitSignature(final Signature obj) - { - } - - @Override - public void visitSourceFile(final SourceFile obj) - { - } - - @Override - public void visitSynthetic(final Synthetic obj) - { - } - - @Override - public void visitUnknown(final Unknown obj) - { - } - - @Override - public void visitStackMap(final StackMap obj) - { - } - - @Override - public void visitStackMapEntry(final StackMapEntry obj) - { - } - - /** - * @since 6.0 - @Override - public void visitStackMapTable(StackMapTable obj) - { - } - */ - - /** - * @since 6.0 - @Override - public void visitStackMapTableEntry(StackMapTableEntry obj) - { - } - */ - - /** - * @since 6.0 - */ - @Override - public void visitEnclosingMethod(final EnclosingMethod obj) - { - } - - /** - * @since 6.0 - */ - @Override - public void visitLocalVariableTypeTable(final LocalVariableTypeTable obj) - { - } - - /** - * @since 6.0 - */ - @Override - public void visitMethodParameters(final MethodParameters obj) - { - } - - /** - * @since 6.4.0 - */ - @Override - public void visitMethodParameter(final MethodParameter obj) - { - } - - /** - * @since 6.0 - */ - @Override - public void visitConstantMethodType(final ConstantMethodType obj) - { - } - - /** - * @since 6.0 - */ - @Override - public void visitConstantMethodHandle(final ConstantMethodHandle constantMethodHandle) { - } - - /** - * @since 6.0 - */ - @Override - public void visitParameterAnnotationEntry(final ParameterAnnotationEntry parameterAnnotationEntry) { - } - - /** - * @since 6.1 - */ - @Override - public void visitConstantPackage(final ConstantPackage constantPackage) { - } - - /** - * @since 6.1 - */ - @Override - public void visitConstantModule(final ConstantModule constantModule) { - } - - /** - * @since 6.3 - */ - @Override - public void visitConstantDynamic(final ConstantDynamic obj) { - } - - /** @since 6.4.0 */ - @Override - public void visitModule(final Module obj) { - } - - /** @since 6.4.0 */ - @Override - public void visitModuleRequires(final ModuleRequires obj) { - } - - /** @since 6.4.0 */ - @Override - public void visitModuleExports(final ModuleExports obj) { - } - - /** @since 6.4.0 */ - @Override - public void visitModuleOpens(final ModuleOpens obj) { - } - - /** @since 6.4.0 */ - @Override - public void visitModuleProvides(final ModuleProvides obj) { - } - - /** @since 6.4.0 */ - @Override - public void visitModulePackages(final ModulePackages obj) { - } - - /** @since 6.4.0 */ - @Override - public void visitModuleMainClass(final ModuleMainClass obj) { - } - - /** @since 6.4.0 */ - @Override - public void visitNestHost(final NestHost obj) { - } - - /** @since 6.4.0 */ - @Override - public void visitNestMembers(final NestMembers obj) { - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/EnclosingMethod.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/EnclosingMethod.java deleted file mode 100644 index 54bbb6b7..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/EnclosingMethod.java +++ /dev/null @@ -1,106 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * This attribute exists for local or - * anonymous classes and ... there can be only one. - * - * @since 6.0 - */ -public class EnclosingMethod extends Attribute { - - // Pointer to the CONSTANT_Class_info structure representing the - // innermost class that encloses the declaration of the current class. - private int classIndex; - - // If the current class is not immediately enclosed by a method or - // constructor, then the value of the method_index item must be zero. - // Otherwise, the value of the method_index item must point to a - // CONSTANT_NameAndType_info structure representing the name and the - // type of a method in the class referenced by the class we point - // to in the class_index. *It is the compiler responsibility* to - // ensure that the method identified by this index is the closest - // lexically enclosing method that includes the local/anonymous class. - private int methodIndex; - - // Ctors - and code to read an attribute in. - EnclosingMethod(final int nameIndex, final int len, final DataInput input, final ConstantPool cpool) throws IOException { - this(nameIndex, len, input.readUnsignedShort(), input.readUnsignedShort(), cpool); - } - - private EnclosingMethod(final int nameIndex, final int len, final int classIdx,final int methodIdx, final ConstantPool cpool) { - super(Const.ATTR_ENCLOSING_METHOD, nameIndex, len, cpool); - classIndex = classIdx; - methodIndex = methodIdx; - } - - @Override - public void accept(final Visitor v) { - v.visitEnclosingMethod(this); - } - - @Override - public Attribute copy(final ConstantPool constant_pool) { - return (Attribute) clone(); - } - - // Accessors - public final int getEnclosingClassIndex() { - return classIndex; - } - - public final int getEnclosingMethodIndex() { - return methodIndex; - } - - public final void setEnclosingClassIndex(final int idx) { - classIndex = idx; - } - - public final void setEnclosingMethodIndex(final int idx) { - methodIndex = idx; - } - - public final ConstantClass getEnclosingClass() { - final ConstantClass c = - (ConstantClass)super.getConstantPool().getConstant(classIndex,Const.CONSTANT_Class); - return c; - } - - public final ConstantNameAndType getEnclosingMethod() { - if (methodIndex == 0) { - return null; - } - final ConstantNameAndType nat = - (ConstantNameAndType)super.getConstantPool().getConstant(methodIndex,Const.CONSTANT_NameAndType); - return nat; - } - - @Override - public final void dump(final DataOutputStream file) throws IOException { - super.dump(file); - file.writeShort(classIndex); - file.writeShort(methodIndex); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/EnumElementValue.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/EnumElementValue.java deleted file mode 100644 index 523d64eb..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/EnumElementValue.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * @since 6.0 - */ -public class EnumElementValue extends ElementValue -{ - // For enum types, these two indices point to the type and value - private final int typeIdx; - - private final int valueIdx; - - public EnumElementValue(final int type, final int typeIdx, final int valueIdx, - final ConstantPool cpool) - { - super(type, cpool); - if (type != ENUM_CONSTANT) { - throw new IllegalArgumentException( - "Only element values of type enum can be built with this ctor - type specified: " + type); - } - this.typeIdx = typeIdx; - this.valueIdx = valueIdx; - } - - @Override - public void dump(final DataOutputStream dos) throws IOException - { - dos.writeByte(super.getType()); // u1 type of value (ENUM_CONSTANT == 'e') - dos.writeShort(typeIdx); // u2 - dos.writeShort(valueIdx); // u2 - } - - @Override - public String stringifyValue() - { - final ConstantUtf8 cu8 = (ConstantUtf8) super.getConstantPool().getConstant(valueIdx, - Const.CONSTANT_Utf8); - return cu8.getBytes(); - } - - public String getEnumTypeString() - { - final ConstantUtf8 cu8 = (ConstantUtf8) super.getConstantPool().getConstant(typeIdx, - Const.CONSTANT_Utf8); - return cu8.getBytes();// Utility.signatureToString(cu8.getBytes()); - } - - public String getEnumValueString() - { - final ConstantUtf8 cu8 = (ConstantUtf8) super.getConstantPool().getConstant(valueIdx, - Const.CONSTANT_Utf8); - return cu8.getBytes(); - } - - public int getValueIndex() - { - return valueIdx; - } - - public int getTypeIndex() - { - return typeIdx; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ExceptionTable.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ExceptionTable.java deleted file mode 100644 index f267566d..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ExceptionTable.java +++ /dev/null @@ -1,181 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * This class represents the table of exceptions that are thrown by a - * method. This attribute may be used once per method. The name of - * this class is ExceptionTable for historical reasons; The - * Java Virtual Machine Specification, Second Edition defines this - * attribute using the name Exceptions (which is inconsistent - * with the other classes). - * - * @see Code - */ -public final class ExceptionTable extends Attribute { - - private int[] exceptionIndexTable; // constant pool - - - /** - * Initialize from another object. Note that both objects use the same - * references (shallow copy). Use copy() for a physical copy. - */ - public ExceptionTable(final ExceptionTable c) { - this(c.getNameIndex(), c.getLength(), c.getExceptionIndexTable(), c.getConstantPool()); - } - - - /** - * @param name_index Index in constant pool - * @param length Content length in bytes - * @param exceptionIndexTable Table of indices in constant pool - * @param constant_pool Array of constants - */ - public ExceptionTable(final int name_index, final int length, final int[] exceptionIndexTable, - final ConstantPool constant_pool) { - super(Const.ATTR_EXCEPTIONS, name_index, length, constant_pool); - this.exceptionIndexTable = exceptionIndexTable != null ? exceptionIndexTable : new int[0]; - } - - - /** - * Construct object from input stream. - * @param nameIndex Index in constant pool - * @param length Content length in bytes - * @param input Input stream - * @param constantPool Array of constants - * @throws IOException - */ - ExceptionTable(final int nameIndex, final int length, final DataInput input, final ConstantPool constantPool) throws IOException { - this(nameIndex, length, (int[]) null, constantPool); - final int number_of_exceptions = input.readUnsignedShort(); - exceptionIndexTable = new int[number_of_exceptions]; - for (int i = 0; i < number_of_exceptions; i++) { - exceptionIndexTable[i] = input.readUnsignedShort(); - } - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitely - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitExceptionTable(this); - } - - - /** - * Dump exceptions attribute to file stream in binary format. - * - * @param file Output file stream - * @throws IOException - */ - @Override - public void dump( final DataOutputStream file ) throws IOException { - super.dump(file); - file.writeShort(exceptionIndexTable.length); - for (final int index : exceptionIndexTable) { - file.writeShort(index); - } - } - - - /** - * @return Array of indices into constant pool of thrown exceptions. - */ - public int[] getExceptionIndexTable() { - return exceptionIndexTable; - } - - - /** - * @return Length of exception table. - */ - public int getNumberOfExceptions() { - return exceptionIndexTable == null ? 0 : exceptionIndexTable.length; - } - - - /** - * @return class names of thrown exceptions - */ - public String[] getExceptionNames() { - final String[] names = new String[exceptionIndexTable.length]; - for (int i = 0; i < exceptionIndexTable.length; i++) { - names[i] = super.getConstantPool().getConstantString(exceptionIndexTable[i], - Const.CONSTANT_Class).replace('/', '.'); - } - return names; - } - - - /** - * @param exceptionIndexTable the list of exception indexes - * Also redefines number_of_exceptions according to table length. - */ - public void setExceptionIndexTable( final int[] exceptionIndexTable ) { - this.exceptionIndexTable = exceptionIndexTable != null ? exceptionIndexTable : new int[0]; - } - - - /** - * @return String representation, i.e., a list of thrown exceptions. - */ - @Override - public String toString() { - final StringBuilder buf = new StringBuilder(); - String str; - buf.append("Exceptions: "); - for (int i = 0; i < exceptionIndexTable.length; i++) { - str = super.getConstantPool().getConstantString(exceptionIndexTable[i], Const.CONSTANT_Class); - buf.append(Utility.compactClassName(str, false)); - if (i < exceptionIndexTable.length - 1) { - buf.append(", "); - } - } - return buf.toString(); - } - - - /** - * @return deep copy of this attribute - */ - @Override - public Attribute copy( final ConstantPool _constant_pool ) { - final ExceptionTable c = (ExceptionTable) clone(); - if (exceptionIndexTable != null) { - c.exceptionIndexTable = new int[exceptionIndexTable.length]; - System.arraycopy(exceptionIndexTable, 0, c.exceptionIndexTable, 0, - exceptionIndexTable.length); - } - c.setConstantPool(_constant_pool); - return c; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/Field.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/Field.java deleted file mode 100644 index 7dea3ddb..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/Field.java +++ /dev/null @@ -1,199 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.IOException; -import java.util.Objects; - -import org.apache.bcel.Const; -import org.apache.bcel.generic.Type; -import org.apache.bcel.util.BCELComparator; - -/** - * This class represents the field info structure, i.e., the representation - * for a variable in the class. See JVM specification for details. - * - */ -public final class Field extends FieldOrMethod { - - private static BCELComparator bcelComparator = new BCELComparator() { - - @Override - public boolean equals( final Object o1, final Object o2 ) { - final Field THIS = (Field) o1; - final Field THAT = (Field) o2; - return Objects.equals(THIS.getName(), THAT.getName()) - && Objects.equals(THIS.getSignature(), THAT.getSignature()); - } - - - @Override - public int hashCode( final Object o ) { - final Field THIS = (Field) o; - return THIS.getSignature().hashCode() ^ THIS.getName().hashCode(); - } - }; - - - /** - * Initialize from another object. Note that both objects use the same - * references (shallow copy). Use clone() for a physical copy. - */ - public Field(final Field c) { - super(c); - } - - - /** - * Construct object from file stream. - * @param file Input stream - */ - Field(final DataInput file, final ConstantPool constant_pool) throws IOException, - ClassFormatException { - super(file, constant_pool); - } - - - /** - * @param access_flags Access rights of field - * @param name_index Points to field name in constant pool - * @param signature_index Points to encoded signature - * @param attributes Collection of attributes - * @param constant_pool Array of constants - */ - public Field(final int access_flags, final int name_index, final int signature_index, final Attribute[] attributes, - final ConstantPool constant_pool) { - super(access_flags, name_index, signature_index, attributes, constant_pool); - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitely - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitField(this); - } - - - /** - * @return constant value associated with this field (may be null) - */ - public ConstantValue getConstantValue() { - for (final Attribute attribute : super.getAttributes()) { - if (attribute.getTag() == Const.ATTR_CONSTANT_VALUE) { - return (ConstantValue) attribute; - } - } - return null; - } - - - /** - * Return string representation close to declaration format, - * `public static final short MAX = 100', e.g.. - * - * @return String representation of field, including the signature. - */ - @Override - public String toString() { - String name; - String signature; - String access; // Short cuts to constant pool - - // Get names from constant pool - access = Utility.accessToString(super.getAccessFlags()); - access = access.isEmpty() ? "" : (access + " "); - signature = Utility.signatureToString(getSignature()); - name = getName(); - final StringBuilder buf = new StringBuilder(64); // CHECKSTYLE IGNORE MagicNumber - buf.append(access).append(signature).append(" ").append(name); - final ConstantValue cv = getConstantValue(); - if (cv != null) { - buf.append(" = ").append(cv); - } - for (final Attribute attribute : super.getAttributes()) { - if (!(attribute instanceof ConstantValue)) { - buf.append(" [").append(attribute).append("]"); - } - } - return buf.toString(); - } - - - /** - * @return deep copy of this field - */ - public Field copy( final ConstantPool _constant_pool ) { - return (Field) copy_(_constant_pool); - } - - - /** - * @return type of field - */ - public Type getType() { - return Type.getReturnType(getSignature()); - } - - - /** - * @return Comparison strategy object - */ - public static BCELComparator getComparator() { - return bcelComparator; - } - - - /** - * @param comparator Comparison strategy object - */ - public static void setComparator( final BCELComparator comparator ) { - bcelComparator = comparator; - } - - - /** - * Return value as defined by given BCELComparator strategy. - * By default two Field objects are said to be equal when - * their names and signatures are equal. - * - * @see java.lang.Object#equals(java.lang.Object) - */ - @Override - public boolean equals( final Object obj ) { - return bcelComparator.equals(this, obj); - } - - - /** - * Return value as defined by given BCELComparator strategy. - * By default return the hashcode of the field's name XOR signature. - * - * @see java.lang.Object#hashCode() - */ - @Override - public int hashCode() { - return bcelComparator.hashCode(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/FieldOrMethod.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/FieldOrMethod.java deleted file mode 100644 index 823801d1..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/FieldOrMethod.java +++ /dev/null @@ -1,294 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * Abstract super class for fields and methods. - * - */ -public abstract class FieldOrMethod extends AccessFlags implements Cloneable, Node { - - /** - * @deprecated (since 6.0) will be made private; do not access directly, use getter/setter - */ - @java.lang.Deprecated - protected int name_index; // Points to field name in constant pool - - /** - * @deprecated (since 6.0) will be made private; do not access directly, use getter/setter - */ - @java.lang.Deprecated - protected int signature_index; // Points to encoded signature - - /** - * @deprecated (since 6.0) will be made private; do not access directly, use getter/setter - */ - @java.lang.Deprecated - protected Attribute[] attributes; // Collection of attributes - - /** - * @deprecated (since 6.0) will be removed (not needed) - */ - @java.lang.Deprecated - protected int attributes_count; // No. of attributes - - // @since 6.0 - private AnnotationEntry[] annotationEntries; // annotations defined on the field or method - - /** - * @deprecated (since 6.0) will be made private; do not access directly, use getter/setter - */ - @java.lang.Deprecated - protected ConstantPool constant_pool; - - private String signatureAttributeString = null; - private boolean searchedForSignatureAttribute = false; - - FieldOrMethod() { - } - - - /** - * Initialize from another object. Note that both objects use the same - * references (shallow copy). Use clone() for a physical copy. - */ - protected FieldOrMethod(final FieldOrMethod c) { - this(c.getAccessFlags(), c.getNameIndex(), c.getSignatureIndex(), c.getAttributes(), c - .getConstantPool()); - } - - - /** - * Construct object from file stream. - * @param file Input stream - * @throws IOException - * @throws ClassFormatException - * @deprecated (6.0) Use {@link #FieldOrMethod(java.io.DataInput, ConstantPool)} instead. - */ - @java.lang.Deprecated - protected FieldOrMethod(final DataInputStream file, final ConstantPool constant_pool) throws IOException, - ClassFormatException { - this((DataInput) file, constant_pool); - } - - /** - * Construct object from file stream. - * @param file Input stream - * @throws IOException - * @throws ClassFormatException - */ - protected FieldOrMethod(final DataInput file, final ConstantPool constant_pool) throws IOException, ClassFormatException { - this(file.readUnsignedShort(), file.readUnsignedShort(), file.readUnsignedShort(), null, - constant_pool); - final int attributes_count = file.readUnsignedShort(); - attributes = new Attribute[attributes_count]; - for (int i = 0; i < attributes_count; i++) { - attributes[i] = Attribute.readAttribute(file, constant_pool); - } - this.attributes_count = attributes_count; // init deprecated field - } - - - /** - * @param access_flags Access rights of method - * @param name_index Points to field name in constant pool - * @param signature_index Points to encoded signature - * @param attributes Collection of attributes - * @param constant_pool Array of constants - */ - protected FieldOrMethod(final int access_flags, final int name_index, final int signature_index, - final Attribute[] attributes, final ConstantPool constant_pool) { - super(access_flags); - this.name_index = name_index; - this.signature_index = signature_index; - this.constant_pool = constant_pool; - setAttributes(attributes); - } - - - /** - * Dump object to file stream on binary format. - * - * @param file Output file stream - * @throws IOException - */ - public final void dump(final DataOutputStream file) throws IOException { - file.writeShort(super.getAccessFlags()); - file.writeShort(name_index); - file.writeShort(signature_index); - file.writeShort(attributes_count); - if (attributes != null) { - for (final Attribute attribute : attributes) { - attribute.dump(file); - } - } - } - - - /** - * @return Collection of object attributes. - */ - public final Attribute[] getAttributes() { - return attributes; - } - - - /** - * @param attributes Collection of object attributes. - */ - public final void setAttributes( final Attribute[] attributes ) { - this.attributes = attributes; - this.attributes_count = attributes != null ? attributes.length : 0; // init deprecated field - } - - - /** - * @return Constant pool used by this object. - */ - public final ConstantPool getConstantPool() { - return constant_pool; - } - - - /** - * @param constant_pool Constant pool to be used for this object. - */ - public final void setConstantPool( final ConstantPool constant_pool ) { - this.constant_pool = constant_pool; - } - - - /** - * @return Index in constant pool of object's name. - */ - public final int getNameIndex() { - return name_index; - } - - - /** - * @param name_index Index in constant pool of object's name. - */ - public final void setNameIndex( final int name_index ) { - this.name_index = name_index; - } - - - /** - * @return Index in constant pool of field signature. - */ - public final int getSignatureIndex() { - return signature_index; - } - - - /** - * @param signature_index Index in constant pool of field signature. - */ - public final void setSignatureIndex( final int signature_index ) { - this.signature_index = signature_index; - } - - - /** - * @return Name of object, i.e., method name or field name - */ - public final String getName() { - ConstantUtf8 c; - c = (ConstantUtf8) constant_pool.getConstant(name_index, Const.CONSTANT_Utf8); - return c.getBytes(); - } - - - /** - * @return String representation of object's type signature (java style) - */ - public final String getSignature() { - ConstantUtf8 c; - c = (ConstantUtf8) constant_pool.getConstant(signature_index, Const.CONSTANT_Utf8); - return c.getBytes(); - } - - - /** - * @return deep copy of this field - */ - protected FieldOrMethod copy_( final ConstantPool _constant_pool ) { - FieldOrMethod c = null; - - try { - c = (FieldOrMethod)clone(); - } catch(final CloneNotSupportedException e) { - // ignored, but will cause NPE ... - } - - c.constant_pool = constant_pool; - c.attributes = new Attribute[attributes.length]; - c.attributes_count = attributes_count; // init deprecated field - - for (int i = 0; i < attributes.length; i++) { - c.attributes[i] = attributes[i].copy(constant_pool); - } - - return c; - } - - /** - * @return Annotations on the field or method - * @since 6.0 - */ - public AnnotationEntry[] getAnnotationEntries() { - if (annotationEntries == null) { - annotationEntries = AnnotationEntry.createAnnotationEntries(getAttributes()); - } - - return annotationEntries; - } - - /** - * Hunts for a signature attribute on the member and returns its contents. So where the 'regular' signature - * may be (Ljava/util/Vector;)V the signature attribute may in fact say 'Ljava/lang/Vector<Ljava/lang/String>;' - * Coded for performance - searches for the attribute only when requested - only searches for it once. - * @since 6.0 - */ - public final String getGenericSignature() - { - if (!searchedForSignatureAttribute) - { - boolean found = false; - for (int i = 0; !found && i < attributes.length; i++) - { - if (attributes[i] instanceof Signature) - { - signatureAttributeString = ((Signature) attributes[i]) - .getSignature(); - found = true; - } - } - searchedForSignatureAttribute = true; - } - return signatureAttributeString; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/InnerClass.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/InnerClass.java deleted file mode 100644 index ff2033af..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/InnerClass.java +++ /dev/null @@ -1,216 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * This class represents a inner class attribute, i.e., the class - * indices of the inner and outer classes, the name and the attributes - * of the inner class. - * - * @see InnerClasses - */ -public final class InnerClass implements Cloneable, Node { - - private int innerClassIndex; - private int outerClassIndex; - private int innerNameIndex; - private int innerAccessFlags; - - - /** - * Initialize from another object. - */ - public InnerClass(final InnerClass c) { - this(c.getInnerClassIndex(), c.getOuterClassIndex(), c.getInnerNameIndex(), c - .getInnerAccessFlags()); - } - - - /** - * Construct object from file stream. - * @param file Input stream - * @throws IOException - */ - InnerClass(final DataInput file) throws IOException { - this(file.readUnsignedShort(), file.readUnsignedShort(), file.readUnsignedShort(), file - .readUnsignedShort()); - } - - - /** - * @param innerClassIndex Class index in constant pool of inner class - * @param outerClassIndex Class index in constant pool of outer class - * @param innerNameIndex Name index in constant pool of inner class - * @param innerAccessFlags Access flags of inner class - */ - public InnerClass(final int innerClassIndex, final int outerClassIndex, final int innerNameIndex, - final int innerAccessFlags) { - this.innerClassIndex = innerClassIndex; - this.outerClassIndex = outerClassIndex; - this.innerNameIndex = innerNameIndex; - this.innerAccessFlags = innerAccessFlags; - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitely - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitInnerClass(this); - } - - - /** - * Dump inner class attribute to file stream in binary format. - * - * @param file Output file stream - * @throws IOException - */ - public void dump( final DataOutputStream file ) throws IOException { - file.writeShort(innerClassIndex); - file.writeShort(outerClassIndex); - file.writeShort(innerNameIndex); - file.writeShort(innerAccessFlags); - } - - - /** - * @return access flags of inner class. - */ - public int getInnerAccessFlags() { - return innerAccessFlags; - } - - - /** - * @return class index of inner class. - */ - public int getInnerClassIndex() { - return innerClassIndex; - } - - - /** - * @return name index of inner class. - */ - public int getInnerNameIndex() { - return innerNameIndex; - } - - - /** - * @return class index of outer class. - */ - public int getOuterClassIndex() { - return outerClassIndex; - } - - - /** - * @param innerAccessFlags access flags for this inner class - */ - public void setInnerAccessFlags( final int innerAccessFlags ) { - this.innerAccessFlags = innerAccessFlags; - } - - - /** - * @param innerClassIndex index into the constant pool for this class - */ - public void setInnerClassIndex( final int innerClassIndex ) { - this.innerClassIndex = innerClassIndex; - } - - - /** - * @param innerNameIndex index into the constant pool for this class's name - */ - public void setInnerNameIndex( final int innerNameIndex ) { // TODO unused - this.innerNameIndex = innerNameIndex; - } - - - /** - * @param outerClassIndex index into the constant pool for the owning class - */ - public void setOuterClassIndex( final int outerClassIndex ) { // TODO unused - this.outerClassIndex = outerClassIndex; - } - - - /** - * @return String representation. - */ - @Override - public String toString() { - return "InnerClass(" + innerClassIndex + ", " + outerClassIndex + ", " - + innerNameIndex + ", " + innerAccessFlags + ")"; - } - - - /** - * @return Resolved string representation - */ - public String toString( final ConstantPool constantPool ) { - String outer_class_name; - String inner_name; - String inner_class_name = constantPool.getConstantString(innerClassIndex, - Const.CONSTANT_Class); - inner_class_name = Utility.compactClassName(inner_class_name, false); - if (outerClassIndex != 0) { - outer_class_name = constantPool.getConstantString(outerClassIndex, - Const.CONSTANT_Class); - outer_class_name = " of class " + Utility.compactClassName(outer_class_name, false); - } else { - outer_class_name = ""; - } - if (innerNameIndex != 0) { - inner_name = ((ConstantUtf8) constantPool.getConstant(innerNameIndex, - Const.CONSTANT_Utf8)).getBytes(); - } else { - inner_name = "(anonymous)"; - } - String access = Utility.accessToString(innerAccessFlags, true); - access = access.isEmpty() ? "" : (access + " "); - return " " + access + inner_name + "=class " + inner_class_name + outer_class_name; - } - - - /** - * @return deep copy of this object - */ - public InnerClass copy() { - try { - return (InnerClass) clone(); - } catch (final CloneNotSupportedException e) { - // TODO should this throw? - } - return null; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/InnerClasses.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/InnerClasses.java deleted file mode 100644 index cb3aadc8..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/InnerClasses.java +++ /dev/null @@ -1,156 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * This class is derived from Attribute and denotes that this class - * is an Inner class of another. - * to the source file of this class. - * It is instantiated from the Attribute.readAttribute() method. - * - * @see Attribute - */ -public final class InnerClasses extends Attribute { - - private InnerClass[] innerClasses; - - - /** - * Initialize from another object. Note that both objects use the same - * references (shallow copy). Use clone() for a physical copy. - */ - public InnerClasses(final InnerClasses c) { - this(c.getNameIndex(), c.getLength(), c.getInnerClasses(), c.getConstantPool()); - } - - - /** - * @param name_index Index in constant pool to CONSTANT_Utf8 - * @param length Content length in bytes - * @param innerClasses array of inner classes attributes - * @param constant_pool Array of constants - */ - public InnerClasses(final int name_index, final int length, final InnerClass[] innerClasses, - final ConstantPool constant_pool) { - super(Const.ATTR_INNER_CLASSES, name_index, length, constant_pool); - this.innerClasses = innerClasses != null ? innerClasses : new InnerClass[0]; - } - - - /** - * Construct object from input stream. - * - * @param name_index Index in constant pool to CONSTANT_Utf8 - * @param length Content length in bytes - * @param input Input stream - * @param constant_pool Array of constants - * @throws IOException - */ - InnerClasses(final int name_index, final int length, final DataInput input, final ConstantPool constant_pool) - throws IOException { - this(name_index, length, (InnerClass[]) null, constant_pool); - final int number_of_classes = input.readUnsignedShort(); - innerClasses = new InnerClass[number_of_classes]; - for (int i = 0; i < number_of_classes; i++) { - innerClasses[i] = new InnerClass(input); - } - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitely - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitInnerClasses(this); - } - - - /** - * Dump source file attribute to file stream in binary format. - * - * @param file Output file stream - * @throws IOException - */ - @Override - public void dump( final DataOutputStream file ) throws IOException { - super.dump(file); - file.writeShort(innerClasses.length); - for (final InnerClass inner_class : innerClasses) { - inner_class.dump(file); - } - } - - - /** - * @return array of inner class "records" - */ - public InnerClass[] getInnerClasses() { - return innerClasses; - } - - - /** - * @param innerClasses the array of inner classes - */ - public void setInnerClasses( final InnerClass[] innerClasses ) { - this.innerClasses = innerClasses != null ? innerClasses : new InnerClass[0]; - } - - - /** - * @return String representation. - */ - @Override - public String toString() { - final StringBuilder buf = new StringBuilder(); - buf.append("InnerClasses("); - buf.append(innerClasses.length); - buf.append("):\n"); - for (final InnerClass inner_class : innerClasses) { - buf.append(inner_class.toString(super.getConstantPool())).append("\n"); - } - return buf.substring(0, buf.length()-1); // remove the last newline - } - - - /** - * @return deep copy of this attribute - */ - @Override - public Attribute copy( final ConstantPool _constant_pool ) { - // TODO this could be recoded to use a lower level constructor after creating a copy of the inner classes - final InnerClasses c = (InnerClasses) clone(); - c.innerClasses = new InnerClass[innerClasses.length]; - for (int i = 0; i < innerClasses.length; i++) { - c.innerClasses[i] = innerClasses[i].copy(); - } - c.setConstantPool(_constant_pool); - return c; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/JavaClass.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/JavaClass.java deleted file mode 100644 index 927015dd..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/JavaClass.java +++ /dev/null @@ -1,929 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.ByteArrayOutputStream; -import java.io.DataOutputStream; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStream; -import java.util.ArrayList; -import java.util.Objects; -import java.util.StringTokenizer; -import java.util.List; -import java.util.Set; -import java.util.TreeSet; - -import org.apache.bcel.Const; -import org.apache.bcel.generic.Type; -import org.apache.bcel.util.BCELComparator; -import org.apache.bcel.util.ClassQueue; -import org.apache.bcel.util.SyntheticRepository; - -/** - * Represents a Java class, i.e., the data structures, constant pool, - * fields, methods and commands contained in a Java .class file. - * See JVM specification for details. - * The intent of this class is to represent a parsed or otherwise existing - * class file. Those interested in programatically generating classes - * should see the ClassGen class. - - * @see org.apache.bcel.generic.ClassGen - */ -public class JavaClass extends AccessFlags implements Cloneable, Node, Comparable { - - private String fileName; - private String packageName; - private String sourceFileName = ""; - private int classNameIndex; - private int superclassNameIndex; - private String className; - private String superclassName; - private int major; - private int minor; // Compiler version - private ConstantPool constantPool; // Constant pool - private int[] interfaces; // implemented interfaces - private String[] interfaceNames; - private Field[] fields; // Fields, i.e., variables of class - private Method[] methods; // methods defined in the class - private Attribute[] attributes; // attributes defined in the class - private AnnotationEntry[] annotations; // annotations defined on the class - private byte source = HEAP; // Generated in memory - private boolean isAnonymous = false; - private boolean isNested = false; - private boolean computedNestedTypeStatus = false; - public static final byte HEAP = 1; - public static final byte FILE = 2; - public static final byte ZIP = 3; - private static final boolean debug = Boolean.getBoolean("JavaClass.debug"); // Debugging on/off - - private static BCELComparator bcelComparator = new BCELComparator() { - - @Override - public boolean equals( final Object o1, final Object o2 ) { - final JavaClass THIS = (JavaClass) o1; - final JavaClass THAT = (JavaClass) o2; - return Objects.equals(THIS.getClassName(), THAT.getClassName()); - } - - - @Override - public int hashCode( final Object o ) { - final JavaClass THIS = (JavaClass) o; - return THIS.getClassName().hashCode(); - } - }; - /** - * In cases where we go ahead and create something, - * use the default SyntheticRepository, because we - * don't know any better. - */ - private transient org.apache.bcel.util.Repository repository = SyntheticRepository - .getInstance(); - - - /** - * Constructor gets all contents as arguments. - * - * @param classNameIndex Index into constant pool referencing a - * ConstantClass that represents this class. - * @param superclassNameIndex Index into constant pool referencing a - * ConstantClass that represents this class's superclass. - * @param fileName File name - * @param major Major compiler version - * @param minor Minor compiler version - * @param access_flags Access rights defined by bit flags - * @param constantPool Array of constants - * @param interfaces Implemented interfaces - * @param fields Class fields - * @param methods Class methods - * @param attributes Class attributes - * @param source Read from file or generated in memory? - */ - public JavaClass(final int classNameIndex, final int superclassNameIndex, final String fileName, final int major, - final int minor, final int access_flags, final ConstantPool constantPool, int[] interfaces, - Field[] fields, Method[] methods, Attribute[] attributes, final byte source) { - super(access_flags); - if (interfaces == null) { - interfaces = new int[0]; - } - if (attributes == null) { - attributes = new Attribute[0]; - } - if (fields == null) { - fields = new Field[0]; - } - if (methods == null) { - methods = new Method[0]; - } - this.classNameIndex = classNameIndex; - this.superclassNameIndex = superclassNameIndex; - this.fileName = fileName; - this.major = major; - this.minor = minor; - this.constantPool = constantPool; - this.interfaces = interfaces; - this.fields = fields; - this.methods = methods; - this.attributes = attributes; - this.source = source; - // Get source file name if available - for (final Attribute attribute : attributes) { - if (attribute instanceof SourceFile) { - sourceFileName = ((SourceFile) attribute).getSourceFileName(); - break; - } - } - /* According to the specification the following entries must be of type - * `ConstantClass' but we check that anyway via the - * `ConstPool.getConstant' method. - */ - className = constantPool.getConstantString(classNameIndex, Const.CONSTANT_Class); - className = Utility.compactClassName(className, false); - final int index = className.lastIndexOf('.'); - if (index < 0) { - packageName = ""; - } else { - packageName = className.substring(0, index); - } - if (superclassNameIndex > 0) { - // May be zero -> class is java.lang.Object - superclassName = constantPool.getConstantString(superclassNameIndex, - Const.CONSTANT_Class); - superclassName = Utility.compactClassName(superclassName, false); - } else { - superclassName = "java.lang.Object"; - } - interfaceNames = new String[interfaces.length]; - for (int i = 0; i < interfaces.length; i++) { - final String str = constantPool.getConstantString(interfaces[i], Const.CONSTANT_Class); - interfaceNames[i] = Utility.compactClassName(str, false); - } - } - - - /** - * Constructor gets all contents as arguments. - * - * @param classNameIndex Class name - * @param superclassNameIndex Superclass name - * @param fileName File name - * @param major Major compiler version - * @param minor Minor compiler version - * @param access_flags Access rights defined by bit flags - * @param constantPool Array of constants - * @param interfaces Implemented interfaces - * @param fields Class fields - * @param methods Class methods - * @param attributes Class attributes - */ - public JavaClass(final int classNameIndex, final int superclassNameIndex, final String fileName, final int major, - final int minor, final int access_flags, final ConstantPool constantPool, final int[] interfaces, - final Field[] fields, final Method[] methods, final Attribute[] attributes) { - this(classNameIndex, superclassNameIndex, fileName, major, minor, access_flags, - constantPool, interfaces, fields, methods, attributes, HEAP); - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitely - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitJavaClass(this); - } - - - /* Print debug information depending on `JavaClass.debug' - */ - static void Debug( final String str ) { - if (debug) { - System.out.println(str); - } - } - - - /** - * Dump class to a file. - * - * @param file Output file - * @throws IOException - */ - public void dump(final File file) throws IOException { - final String parent = file.getParent(); - if (parent != null) { - final File dir = new File(parent); - if (!dir.mkdirs()) { // either was not created or already existed - if (!dir.isDirectory()) { - throw new IOException("Could not create the directory " + dir); - } - } - } - try (DataOutputStream dos = new DataOutputStream(new FileOutputStream(file))) { - dump(dos); - } - } - - - /** - * Dump class to a file named fileName. - * - * @param _file_name Output file name - * @throws IOException - */ - public void dump( final String _file_name ) throws IOException { - dump(new File(_file_name)); - } - - - /** - * @return class in binary format - */ - public byte[] getBytes() { - final ByteArrayOutputStream s = new ByteArrayOutputStream(); - final DataOutputStream ds = new DataOutputStream(s); - try { - dump(ds); - } catch (final IOException e) { - e.printStackTrace(); - } finally { - try { - ds.close(); - } catch (final IOException e2) { - e2.printStackTrace(); - } - } - return s.toByteArray(); - } - - - /** - * Dump Java class to output stream in binary format. - * - * @param file Output stream - * @throws IOException - */ - public void dump( final OutputStream file ) throws IOException { - dump(new DataOutputStream(file)); - } - - - /** - * Dump Java class to output stream in binary format. - * - * @param file Output stream - * @throws IOException - */ - public void dump( final DataOutputStream file ) throws IOException { - file.writeInt(Const.JVM_CLASSFILE_MAGIC); - file.writeShort(minor); - file.writeShort(major); - constantPool.dump(file); - file.writeShort(super.getAccessFlags()); - file.writeShort(classNameIndex); - file.writeShort(superclassNameIndex); - file.writeShort(interfaces.length); - for (final int interface1 : interfaces) { - file.writeShort(interface1); - } - file.writeShort(fields.length); - for (final Field field : fields) { - field.dump(file); - } - file.writeShort(methods.length); - for (final Method method : methods) { - method.dump(file); - } - if (attributes != null) { - file.writeShort(attributes.length); - for (final Attribute attribute : attributes) { - attribute.dump(file); - } - } else { - file.writeShort(0); - } - file.flush(); - } - - - /** - * @return Attributes of the class. - */ - public Attribute[] getAttributes() { - return attributes; - } - - /** - * @return Annotations on the class - * @since 6.0 - */ - public AnnotationEntry[] getAnnotationEntries() { - if (annotations == null) { - annotations = AnnotationEntry.createAnnotationEntries(getAttributes()); - } - - return annotations; - } - - /** - * @return Class name. - */ - public String getClassName() { - return className; - } - - - /** - * @return Package name. - */ - public String getPackageName() { - return packageName; - } - - - /** - * @return Class name index. - */ - public int getClassNameIndex() { - return classNameIndex; - } - - - /** - * @return Constant pool. - */ - public ConstantPool getConstantPool() { - return constantPool; - } - - - /** - * @return Fields, i.e., variables of the class. Like the JVM spec - * mandates for the classfile format, these fields are those specific to - * this class, and not those of the superclass or superinterfaces. - */ - public Field[] getFields() { - return fields; - } - - - /** - * @return File name of class, aka SourceFile attribute value - */ - public String getFileName() { - return fileName; - } - - - /** - * @return Names of implemented interfaces. - */ - public String[] getInterfaceNames() { - return interfaceNames; - } - - - /** - * @return Indices in constant pool of implemented interfaces. - */ - public int[] getInterfaceIndices() { - return interfaces; - } - - - /** - * @return Major number of class file version. - */ - public int getMajor() { - return major; - } - - - /** - * @return Methods of the class. - */ - public Method[] getMethods() { - return methods; - } - - - /** - * @return A {@link Method} corresponding to - * java.lang.reflect.Method if any - */ - public Method getMethod( final java.lang.reflect.Method m ) { - for (final Method method : methods) { - if (m.getName().equals(method.getName()) && (m.getModifiers() == method.getModifiers()) - && Type.getSignature(m).equals(method.getSignature())) { - return method; - } - } - return null; - } - - - /** - * @return Minor number of class file version. - */ - public int getMinor() { - return minor; - } - - - /** - * @return sbsolute path to file where this class was read from - */ - public String getSourceFileName() { - return sourceFileName; - } - - - /** - * returns the super class name of this class. In the case that this class is - * java.lang.Object, it will return itself (java.lang.Object). This is probably incorrect - * but isn't fixed at this time to not break existing clients. - * - * @return Superclass name. - */ - public String getSuperclassName() { - return superclassName; - } - - - /** - * @return Class name index. - */ - public int getSuperclassNameIndex() { - return superclassNameIndex; - } - - /** - * @param attributes . - */ - public void setAttributes( final Attribute[] attributes ) { - this.attributes = attributes; - } - - - /** - * @param className . - */ - public void setClassName( final String className ) { - this.className = className; - } - - - /** - * @param classNameIndex . - */ - public void setClassNameIndex( final int classNameIndex ) { - this.classNameIndex = classNameIndex; - } - - - /** - * @param constantPool . - */ - public void setConstantPool( final ConstantPool constantPool ) { - this.constantPool = constantPool; - } - - - /** - * @param fields . - */ - public void setFields( final Field[] fields ) { - this.fields = fields; - } - - - /** - * Set File name of class, aka SourceFile attribute value - */ - public void setFileName( final String fileName ) { - this.fileName = fileName; - } - - - /** - * @param interfaceNames . - */ - public void setInterfaceNames( final String[] interfaceNames ) { - this.interfaceNames = interfaceNames; - } - - - /** - * @param interfaces . - */ - public void setInterfaces( final int[] interfaces ) { - this.interfaces = interfaces; - } - - - /** - * @param major . - */ - public void setMajor( final int major ) { - this.major = major; - } - - - /** - * @param methods . - */ - public void setMethods( final Method[] methods ) { - this.methods = methods; - } - - - /** - * @param minor . - */ - public void setMinor( final int minor ) { - this.minor = minor; - } - - - /** - * Set absolute path to file this class was read from. - */ - public void setSourceFileName( final String sourceFileName ) { - this.sourceFileName = sourceFileName; - } - - - /** - * @param superclassName . - */ - public void setSuperclassName( final String superclassName ) { - this.superclassName = superclassName; - } - - - /** - * @param superclassNameIndex . - */ - public void setSuperclassNameIndex( final int superclassNameIndex ) { - this.superclassNameIndex = superclassNameIndex; - } - - - /** - * @return String representing class contents. - */ - @Override - public String toString() { - String access = Utility.accessToString(super.getAccessFlags(), true); - access = access.isEmpty() ? "" : (access + " "); - final StringBuilder buf = new StringBuilder(128); - buf.append(access).append(Utility.classOrInterface(super.getAccessFlags())).append(" ").append( - className).append(" extends ").append( - Utility.compactClassName(superclassName, false)).append('\n'); - final int size = interfaces.length; - if (size > 0) { - buf.append("implements\t\t"); - for (int i = 0; i < size; i++) { - buf.append(interfaceNames[i]); - if (i < size - 1) { - buf.append(", "); - } - } - buf.append('\n'); - } - buf.append("file name\t\t").append(fileName).append('\n'); - buf.append("compiled from\t\t").append(sourceFileName).append('\n'); - buf.append("compiler version\t").append(major).append(".").append(minor).append('\n'); - buf.append("access flags\t\t").append(super.getAccessFlags()).append('\n'); - buf.append("constant pool\t\t").append(constantPool.getLength()).append(" entries\n"); - buf.append("ACC_SUPER flag\t\t").append(isSuper()).append("\n"); - if (attributes.length > 0) { - buf.append("\nAttribute(s):\n"); - for (final Attribute attribute : attributes) { - buf.append(indent(attribute)); - } - } - final AnnotationEntry[] annotations = getAnnotationEntries(); - if (annotations!=null && annotations.length>0) { - buf.append("\nAnnotation(s):\n"); - for (final AnnotationEntry annotation : annotations) { - buf.append(indent(annotation)); - } - } - if (fields.length > 0) { - buf.append("\n").append(fields.length).append(" fields:\n"); - for (final Field field : fields) { - buf.append("\t").append(field).append('\n'); - } - } - if (methods.length > 0) { - buf.append("\n").append(methods.length).append(" methods:\n"); - for (final Method method : methods) { - buf.append("\t").append(method).append('\n'); - } - } - return buf.toString(); - } - - - private static String indent( final Object obj ) { - final StringTokenizer tok = new StringTokenizer(obj.toString(), "\n"); - final StringBuilder buf = new StringBuilder(); - while (tok.hasMoreTokens()) { - buf.append("\t").append(tok.nextToken()).append("\n"); - } - return buf.toString(); - } - - - /** - * @return deep copy of this class - */ - public JavaClass copy() { - JavaClass c = null; - try { - c = (JavaClass) clone(); - c.constantPool = constantPool.copy(); - c.interfaces = interfaces.clone(); - c.interfaceNames = interfaceNames.clone(); - c.fields = new Field[fields.length]; - for (int i = 0; i < fields.length; i++) { - c.fields[i] = fields[i].copy(c.constantPool); - } - c.methods = new Method[methods.length]; - for (int i = 0; i < methods.length; i++) { - c.methods[i] = methods[i].copy(c.constantPool); - } - c.attributes = new Attribute[attributes.length]; - for (int i = 0; i < attributes.length; i++) { - c.attributes[i] = attributes[i].copy(c.constantPool); - } - } catch (final CloneNotSupportedException e) { - // TODO should this throw? - } - return c; - } - - - public final boolean isSuper() { - return (super.getAccessFlags() & Const.ACC_SUPER) != 0; - } - - - public final boolean isClass() { - return (super.getAccessFlags() & Const.ACC_INTERFACE) == 0; - } - - /** - * @since 6.0 - */ - public final boolean isAnonymous() { - computeNestedTypeStatus(); - return this.isAnonymous; - } - - /** - * @since 6.0 - */ - public final boolean isNested() { - computeNestedTypeStatus(); - return this.isNested; - } - - private void computeNestedTypeStatus() { - if (computedNestedTypeStatus) { - return; - } - for (final Attribute attribute : this.attributes) { - if (attribute instanceof InnerClasses) { - final InnerClass[] innerClasses = ((InnerClasses) attribute).getInnerClasses(); - for (final InnerClass innerClasse : innerClasses) { - boolean innerClassAttributeRefersToMe = false; - String inner_class_name = constantPool.getConstantString(innerClasse.getInnerClassIndex(), - Const.CONSTANT_Class); - inner_class_name = Utility.compactClassName(inner_class_name, false); - if (inner_class_name.equals(getClassName())) { - innerClassAttributeRefersToMe = true; - } - if (innerClassAttributeRefersToMe) { - this.isNested = true; - if (innerClasse.getInnerNameIndex() == 0) { - this.isAnonymous = true; - } - } - } - } - } - this.computedNestedTypeStatus = true; - } - - - /** @return returns either HEAP (generated), FILE, or ZIP - */ - public final byte getSource() { - return source; - } - - - /********************* New repository functionality *********************/ - /** - * Gets the ClassRepository which holds its definition. By default - * this is the same as SyntheticRepository.getInstance(); - */ - public org.apache.bcel.util.Repository getRepository() { - return repository; - } - - - /** - * Sets the ClassRepository which loaded the JavaClass. - * Should be called immediately after parsing is done. - */ - public void setRepository( final org.apache.bcel.util.Repository repository ) { // TODO make protected? - this.repository = repository; - } - - - /** Equivalent to runtime "instanceof" operator. - * - * @return true if this JavaClass is derived from the super class - * @throws ClassNotFoundException if superclasses or superinterfaces - * of this object can't be found - */ - public final boolean instanceOf( final JavaClass super_class ) throws ClassNotFoundException { - if (this.equals(super_class)) { - return true; - } - final JavaClass[] super_classes = getSuperClasses(); - for (final JavaClass super_classe : super_classes) { - if (super_classe.equals(super_class)) { - return true; - } - } - if (super_class.isInterface()) { - return implementationOf(super_class); - } - return false; - } - - - /** - * @return true, if this class is an implementation of interface inter - * @throws ClassNotFoundException if superclasses or superinterfaces - * of this class can't be found - */ - public boolean implementationOf( final JavaClass inter ) throws ClassNotFoundException { - if (!inter.isInterface()) { - throw new IllegalArgumentException(inter.getClassName() + " is no interface"); - } - if (this.equals(inter)) { - return true; - } - final JavaClass[] super_interfaces = getAllInterfaces(); - for (final JavaClass super_interface : super_interfaces) { - if (super_interface.equals(inter)) { - return true; - } - } - return false; - } - - - /** - * @return the superclass for this JavaClass object, or null if this - * is java.lang.Object - * @throws ClassNotFoundException if the superclass can't be found - */ - public JavaClass getSuperClass() throws ClassNotFoundException { - if ("java.lang.Object".equals(getClassName())) { - return null; - } - return repository.loadClass(getSuperclassName()); - } - - - /** - * @return list of super classes of this class in ascending order, i.e., - * java.lang.Object is always the last element - * @throws ClassNotFoundException if any of the superclasses can't be found - */ - public JavaClass[] getSuperClasses() throws ClassNotFoundException { - JavaClass clazz = this; - final List allSuperClasses = new ArrayList<>(); - for (clazz = clazz.getSuperClass(); clazz != null; clazz = clazz.getSuperClass()) { - allSuperClasses.add(clazz); - } - return allSuperClasses.toArray(new JavaClass[allSuperClasses.size()]); - } - - - /** - * Get interfaces directly implemented by this JavaClass. - */ - public JavaClass[] getInterfaces() throws ClassNotFoundException { - final String[] _interfaces = getInterfaceNames(); - final JavaClass[] classes = new JavaClass[_interfaces.length]; - for (int i = 0; i < _interfaces.length; i++) { - classes[i] = repository.loadClass(_interfaces[i]); - } - return classes; - } - - - /** - * Get all interfaces implemented by this JavaClass (transitively). - */ - public JavaClass[] getAllInterfaces() throws ClassNotFoundException { - final ClassQueue queue = new ClassQueue(); - final Set allInterfaces = new TreeSet<>(); - queue.enqueue(this); - while (!queue.empty()) { - final JavaClass clazz = queue.dequeue(); - final JavaClass souper = clazz.getSuperClass(); - final JavaClass[] _interfaces = clazz.getInterfaces(); - if (clazz.isInterface()) { - allInterfaces.add(clazz); - } else { - if (souper != null) { - queue.enqueue(souper); - } - } - for (final JavaClass _interface : _interfaces) { - queue.enqueue(_interface); - } - } - return allInterfaces.toArray(new JavaClass[allInterfaces.size()]); - } - - - /** - * @return Comparison strategy object - */ - public static BCELComparator getComparator() { - return bcelComparator; - } - - - /** - * @param comparator Comparison strategy object - */ - public static void setComparator( final BCELComparator comparator ) { - bcelComparator = comparator; - } - - - /** - * Return value as defined by given BCELComparator strategy. - * By default two JavaClass objects are said to be equal when - * their class names are equal. - * - * @see java.lang.Object#equals(java.lang.Object) - */ - @Override - public boolean equals( final Object obj ) { - return bcelComparator.equals(this, obj); - } - - - /** - * Return the natural ordering of two JavaClasses. - * This ordering is based on the class name - * @since 6.0 - */ - @Override - public int compareTo( final JavaClass obj ) { - return getClassName().compareTo(obj.getClassName()); - } - - - /** - * Return value as defined by given BCELComparator strategy. - * By default return the hashcode of the class name. - * - * @see java.lang.Object#hashCode() - */ - @Override - public int hashCode() { - return bcelComparator.hashCode(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/LineNumber.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/LineNumber.java deleted file mode 100644 index b5cb9e3d..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/LineNumber.java +++ /dev/null @@ -1,147 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -/** - * This class represents a (PC offset, line number) pair, i.e., a line number in - * the source that corresponds to a relative address in the byte code. This - * is used for debugging purposes. - * - * @see LineNumberTable - */ -public final class LineNumber implements Cloneable, Node { - - /** Program Counter (PC) corresponds to line */ - private short startPc; - - /** number in source file */ - private short lineNumber; - - /** - * Initialize from another object. - * - * @param c the object to copy - */ - public LineNumber(final LineNumber c) { - this(c.getStartPC(), c.getLineNumber()); - } - - - /** - * Construct object from file stream. - * - * @param file Input stream - * @throws IOException if an I/O Exception occurs in readUnsignedShort - */ - LineNumber(final DataInput file) throws IOException { - this(file.readUnsignedShort(), file.readUnsignedShort()); - } - - - /** - * @param startPc Program Counter (PC) corresponds to - * @param lineNumber line number in source file - */ - public LineNumber(final int startPc, final int lineNumber) { - this.startPc = (short) startPc; - this.lineNumber = (short)lineNumber; - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitely - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitLineNumber(this); - } - - - /** - * Dump line number/pc pair to file stream in binary format. - * - * @param file Output file stream - * @throws IOException if an I/O Exception occurs in writeShort - */ - public void dump( final DataOutputStream file ) throws IOException { - file.writeShort(startPc); - file.writeShort(lineNumber); - } - - - /** - * @return Corresponding source line - */ - public int getLineNumber() { - return 0xffff & lineNumber; - } - - - /** - * @return PC in code - */ - public int getStartPC() { - return 0xffff & startPc; - } - - - /** - * @param lineNumber the source line number - */ - public void setLineNumber( final int lineNumber ) { - this.lineNumber = (short) lineNumber; - } - - - /** - * @param startPc the pc for this line number - */ - public void setStartPC( final int startPc ) { - this.startPc = (short) startPc; - } - - - /** - * @return String representation - */ - @Override - public String toString() { - return "LineNumber(" + startPc + ", " + lineNumber + ")"; - } - - - /** - * @return deep copy of this object - */ - public LineNumber copy() { - try { - return (LineNumber) clone(); - } catch (final CloneNotSupportedException e) { - // TODO should this throw? - } - return null; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/LineNumberTable.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/LineNumberTable.java deleted file mode 100644 index 961430ba..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/LineNumberTable.java +++ /dev/null @@ -1,215 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * This class represents a table of line numbers for debugging - * purposes. This attribute is used by the Code attribute. It - * contains pairs of PCs and line numbers. - * - * @see Code - * @see LineNumber - */ -public final class LineNumberTable extends Attribute { - - private static final int MAX_LINE_LENGTH = 72; - private LineNumber[] lineNumberTable; // Table of line/numbers pairs - - - /* - * Initialize from another object. Note that both objects use the same - * references (shallow copy). Use copy() for a physical copy. - */ - public LineNumberTable(final LineNumberTable c) { - this(c.getNameIndex(), c.getLength(), c.getLineNumberTable(), c.getConstantPool()); - } - - - /* - * @param name_index Index of name - * @param length Content length in bytes - * @param lineNumberTable Table of line/numbers pairs - * @param constant_pool Array of constants - */ - public LineNumberTable(final int name_index, final int length, final LineNumber[] line_number_table, - final ConstantPool constant_pool) { - super(Const.ATTR_LINE_NUMBER_TABLE, name_index, length, constant_pool); - this.lineNumberTable = line_number_table; - } - - - /** - * Construct object from input stream. - * @param name_index Index of name - * @param length Content length in bytes - * @param input Input stream - * @param constant_pool Array of constants - * @throws IOException if an I/O Exception occurs in readUnsignedShort - */ - LineNumberTable(final int name_index, final int length, final DataInput input, final ConstantPool constant_pool) - throws IOException { - this(name_index, length, (LineNumber[]) null, constant_pool); - final int line_number_table_length = input.readUnsignedShort(); - lineNumberTable = new LineNumber[line_number_table_length]; - for (int i = 0; i < line_number_table_length; i++) { - lineNumberTable[i] = new LineNumber(input); - } - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitely - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitLineNumberTable(this); - } - - - /** - * Dump line number table attribute to file stream in binary format. - * - * @param file Output file stream - * @throws IOException if an I/O Exception occurs in writeShort - */ - @Override - public void dump( final DataOutputStream file ) throws IOException { - super.dump(file); - file.writeShort(lineNumberTable.length); - for (final LineNumber lineNumber : lineNumberTable) { - lineNumber.dump(file); - } - } - - - /** - * @return Array of (pc offset, line number) pairs. - */ - public LineNumber[] getLineNumberTable() { - return lineNumberTable; - } - - - /** - * @param lineNumberTable the line number entries for this table - */ - public void setLineNumberTable( final LineNumber[] lineNumberTable ) { - this.lineNumberTable = lineNumberTable; - } - - - /** - * @return String representation. - */ - @Override - public String toString() { - final StringBuilder buf = new StringBuilder(); - final StringBuilder line = new StringBuilder(); - final String newLine = System.getProperty("line.separator", "\n"); - for (int i = 0; i < lineNumberTable.length; i++) { - line.append(lineNumberTable[i].toString()); - if (i < lineNumberTable.length - 1) { - line.append(", "); - } - if ((line.length() > MAX_LINE_LENGTH) && (i < lineNumberTable.length - 1)) { - line.append(newLine); - buf.append(line); - line.setLength(0); - } - } - buf.append(line); - return buf.toString(); - } - - - /** - * Map byte code positions to source code lines. - * - * @param pos byte code offset - * @return corresponding line in source code - */ - public int getSourceLine( final int pos ) { - int l = 0; - int r = lineNumberTable.length - 1; - if (r < 0) { - return -1; - } - int min_index = -1; - int min = -1; - /* Do a binary search since the array is ordered. - */ - do { - final int i = (l + r) >>> 1; - final int j = lineNumberTable[i].getStartPC(); - if (j == pos) { - return lineNumberTable[i].getLineNumber(); - } else if (pos < j) { - r = i - 1; - } else { - l = i + 1; - } - /* If exact match can't be found (which is the most common case) - * return the line number that corresponds to the greatest index less - * than pos. - */ - if (j < pos && j > min) { - min = j; - min_index = i; - } - } while (l <= r); - /* It's possible that we did not find any valid entry for the bytecode - * offset we were looking for. - */ - if (min_index < 0) { - return -1; - } - return lineNumberTable[min_index].getLineNumber(); - } - - - /** - * @return deep copy of this attribute - */ - @Override - public Attribute copy( final ConstantPool _constant_pool ) { - // TODO could use the lower level constructor and thereby allow - // lineNumberTable to be made final - final LineNumberTable c = (LineNumberTable) clone(); - c.lineNumberTable = new LineNumber[lineNumberTable.length]; - for (int i = 0; i < lineNumberTable.length; i++) { - c.lineNumberTable[i] = lineNumberTable[i].copy(); - } - c.setConstantPool(_constant_pool); - return c; - } - - - public int getTableLength() { - return lineNumberTable == null ? 0 : lineNumberTable.length; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/LocalVariable.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/LocalVariable.java deleted file mode 100644 index 7f388786..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/LocalVariable.java +++ /dev/null @@ -1,303 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; -import org.apache.bcel.Constants; - -/** - * This class represents a local variable within a method. It contains its - * scope, name, signature and index on the method's frame. It is used both - * to represent an element of the LocalVariableTable as well as an element - * of the LocalVariableTypeTable. The nomenclature used here may be a bit confusing; - * while the two items have the same layout in a class file, a LocalVariableTable - * attribute contains a descriptor_index, not a signatureIndex. The - * LocalVariableTypeTable attribute does have a signatureIndex. - * @see org.apache.bcel.classfile.Utility for more details on the difference. - * - * @see LocalVariableTable - * @see LocalVariableTypeTable - */ -public final class LocalVariable implements Cloneable, Node, Constants { - - private int startPc; // Range in which the variable is valid - private int length; - private int nameIndex; // Index in constant pool of variable name - // Technically, a decscriptor_index for a local variable table entry - // and a signatureIndex for a local variable type table entry. - private int signatureIndex; // Index of variable signature - private int index; /* Variable is index'th local variable on - * this method's frame. - */ - private ConstantPool constantPool; - private int origIndex; // never changes; used to match up with LocalVariableTypeTable entries - - - /** - * Initializes from another LocalVariable. Note that both objects use the same - * references (shallow copy). Use copy() for a physical copy. - * - * @param localVariable Another LocalVariable. - */ - public LocalVariable(final LocalVariable localVariable) { - this(localVariable.getStartPC(), localVariable.getLength(), localVariable.getNameIndex(), - localVariable.getSignatureIndex(), localVariable.getIndex(), localVariable.getConstantPool()); - this.origIndex = localVariable.getOrigIndex(); - } - - /** - * Constructs object from file stream. - * @param file Input stream - * @throws IOException - */ - LocalVariable(final DataInput file, final ConstantPool constant_pool) throws IOException { - this(file.readUnsignedShort(), file.readUnsignedShort(), file.readUnsignedShort(), file - .readUnsignedShort(), file.readUnsignedShort(), constant_pool); - } - - - /** - * @param startPc Range in which the variable - * @param length ... is valid - * @param nameIndex Index in constant pool of variable name - * @param signatureIndex Index of variable's signature - * @param index Variable is `index'th local variable on the method's frame - * @param constantPool Array of constants - */ - public LocalVariable(final int startPc, final int length, final int nameIndex, final int signatureIndex, final int index, - final ConstantPool constantPool) { - this.startPc = startPc; - this.length = length; - this.nameIndex = nameIndex; - this.signatureIndex = signatureIndex; - this.index = index; - this.constantPool = constantPool; - this.origIndex = index; - } - - - /** - * @param startPc Range in which the variable - * @param length ... is valid - * @param nameIndex Index in constant pool of variable name - * @param signatureIndex Index of variable's signature - * @param index Variable is `index'th local variable on the method's frame - * @param constantPool Array of constants - * @param origIndex Variable is `index'th local variable on the method's frame prior to any changes - */ - public LocalVariable(final int startPc, final int length, final int nameIndex, final int signatureIndex, final int index, - final ConstantPool constantPool, final int origIndex) { - this.startPc = startPc; - this.length = length; - this.nameIndex = nameIndex; - this.signatureIndex = signatureIndex; - this.index = index; - this.constantPool = constantPool; - this.origIndex = origIndex; - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitely - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitLocalVariable(this); - } - - - /** - * Dumps local variable to file stream in binary format. - * - * @param dataOutputStream Output file stream - * @exception IOException if an I/O error occurs. - * @see java.io.FilterOutputStream#out - */ - public void dump(final DataOutputStream dataOutputStream) throws IOException { - dataOutputStream.writeShort(startPc); - dataOutputStream.writeShort(length); - dataOutputStream.writeShort(nameIndex); - dataOutputStream.writeShort(signatureIndex); - dataOutputStream.writeShort(index); - } - - /** - * @return Constant pool used by this object. - */ - public ConstantPool getConstantPool() { - return constantPool; - } - - - /** - * @return Variable is valid within getStartPC() .. getStartPC()+getLength() - */ - public int getLength() { - return length; - } - - - /** - * @return Variable name. - */ - public String getName() { - ConstantUtf8 c; - c = (ConstantUtf8) constantPool.getConstant(nameIndex, Const.CONSTANT_Utf8); - return c.getBytes(); - } - - - /** - * @return Index in constant pool of variable name. - */ - public int getNameIndex() { - return nameIndex; - } - - - /** - * @return Signature. - */ - public String getSignature() { - ConstantUtf8 c; - c = (ConstantUtf8) constantPool.getConstant(signatureIndex, Const.CONSTANT_Utf8); - return c.getBytes(); - } - - - /** - * @return Index in constant pool of variable signature. - */ - public int getSignatureIndex() { - return signatureIndex; - } - - - /** - * @return index of register where variable is stored - */ - public int getIndex() { - return index; - } - - - /** - * @return index of register where variable was originally stored - */ - public int getOrigIndex() { - return origIndex; - } - - - /** - * @return Start of range where the variable is valid - */ - public int getStartPC() { - return startPc; - } - - - /* - * Helper method shared with LocalVariableTypeTable - */ - String toStringShared( final boolean typeTable ) { - final String name = getName(); - final String signature = Utility.signatureToString(getSignature(), false); - final String label = "LocalVariable" + (typeTable ? "Types" : "" ); - return label + "(startPc = " + startPc + ", length = " + length + ", index = " - + index + ":" + signature + " " + name + ")"; - } - - - /** - * @param constantPool Constant pool to be used for this object. - */ - public void setConstantPool( final ConstantPool constantPool ) { - this.constantPool = constantPool; - } - - - /** - * @param length the length of this local variable - */ - public void setLength( final int length ) { - this.length = length; - } - - - /** - * @param nameIndex the index into the constant pool for the name of this variable - */ - public void setNameIndex( final int nameIndex ) { // TODO unused - this.nameIndex = nameIndex; - } - - - /** - * @param signatureIndex the index into the constant pool for the signature of this variable - */ - public void setSignatureIndex( final int signatureIndex ) { // TODO unused - this.signatureIndex = signatureIndex; - } - - - /** - * @param index the index in the local variable table of this variable - */ - public void setIndex( final int index ) { // TODO unused - this.index = index; - } - - - /** - * @param startPc Specify range where the local variable is valid. - */ - public void setStartPC( final int startPc ) { // TODO unused - this.startPc = startPc; - } - - - /** - * @return string representation. - */ - @Override - public String toString() { - return toStringShared(false); - } - - - /** - * @return deep copy of this object - */ - public LocalVariable copy() { - try { - return (LocalVariable) clone(); - } catch (final CloneNotSupportedException e) { - // TODO should this throw? - } - return null; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/LocalVariableTable.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/LocalVariableTable.java deleted file mode 100644 index 2babef9b..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/LocalVariableTable.java +++ /dev/null @@ -1,196 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * This class represents colection of local variables in a - * method. This attribute is contained in the Code attribute. - * - * @see Code - * @see LocalVariable - */ -public class LocalVariableTable extends Attribute { - - private LocalVariable[] localVariableTable; // variables - - - /** - * Initialize from another object. Note that both objects use the same - * references (shallow copy). Use copy() for a physical copy. - */ - public LocalVariableTable(final LocalVariableTable c) { - this(c.getNameIndex(), c.getLength(), c.getLocalVariableTable(), c.getConstantPool()); - } - - - /** - * @param nameIndex Index in constant pool to `LocalVariableTable' - * @param length Content length in bytes - * @param localVariableTable Table of local variables - * @param constantPool Array of constants - */ - public LocalVariableTable(final int nameIndex, final int length, final LocalVariable[] localVariableTable, - final ConstantPool constantPool) { - super(Const.ATTR_LOCAL_VARIABLE_TABLE, nameIndex, length, constantPool); - this.localVariableTable = localVariableTable; - } - - - /** - * Construct object from input stream. - * @param name_index Index in constant pool - * @param length Content length in bytes - * @param input Input stream - * @param constant_pool Array of constants - * @throws IOException - */ - LocalVariableTable(final int name_index, final int length, final DataInput input, final ConstantPool constant_pool) - throws IOException { - this(name_index, length, (LocalVariable[]) null, constant_pool); - final int local_variable_table_length = input.readUnsignedShort(); - localVariableTable = new LocalVariable[local_variable_table_length]; - for (int i = 0; i < local_variable_table_length; i++) { - localVariableTable[i] = new LocalVariable(input, constant_pool); - } - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitely - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitLocalVariableTable(this); - } - - - /** - * Dump local variable table attribute to file stream in binary format. - * - * @param file Output file stream - * @throws IOException - */ - @Override - public final void dump( final DataOutputStream file ) throws IOException { - super.dump(file); - file.writeShort(localVariableTable.length); - for (final LocalVariable variable : localVariableTable) { - variable.dump(file); - } - } - - - /** - * @return Array of local variables of method. - */ - public final LocalVariable[] getLocalVariableTable() { - return localVariableTable; - } - - - /** - * - * @param index the variable slot - * - * @return the first LocalVariable that matches the slot or null if not found - * - * @deprecated since 5.2 because multiple variables can share the - * same slot, use getLocalVariable(int index, int pc) instead. - */ - @java.lang.Deprecated - public final LocalVariable getLocalVariable( final int index ) { - for (final LocalVariable variable : localVariableTable) { - if (variable.getIndex() == index) { - return variable; - } - } - return null; - } - - - /** - * - * @param index the variable slot - * @param pc the current pc that this variable is alive - * - * @return the LocalVariable that matches or null if not found - */ - public final LocalVariable getLocalVariable( final int index, final int pc ) { - for (final LocalVariable variable : localVariableTable) { - if (variable.getIndex() == index) { - final int start_pc = variable.getStartPC(); - final int end_pc = start_pc + variable.getLength(); - if ((pc >= start_pc) && (pc <= end_pc)) { - return variable; - } - } - } - return null; - } - - - public final void setLocalVariableTable( final LocalVariable[] local_variable_table ) { - this.localVariableTable = local_variable_table; - } - - - /** - * @return String representation. - */ - @Override - public final String toString() { - final StringBuilder buf = new StringBuilder(); - for (int i = 0; i < localVariableTable.length; i++) { - buf.append(localVariableTable[i]); - if (i < localVariableTable.length - 1) { - buf.append('\n'); - } - } - return buf.toString(); - } - - - /** - * @return deep copy of this attribute - */ - @Override - public Attribute copy( final ConstantPool _constant_pool ) { - final LocalVariableTable c = (LocalVariableTable) clone(); - c.localVariableTable = new LocalVariable[localVariableTable.length]; - for (int i = 0; i < localVariableTable.length; i++) { - c.localVariableTable[i] = localVariableTable[i].copy(); - } - c.setConstantPool(_constant_pool); - return c; - } - - - public final int getTableLength() { - return localVariableTable == null ? 0 : localVariableTable.length; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/LocalVariableTypeTable.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/LocalVariableTypeTable.java deleted file mode 100644 index afd1325e..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/LocalVariableTypeTable.java +++ /dev/null @@ -1,150 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -// The new table is used when generic types are about... - -//LocalVariableTable_attribute { -// u2 attribute_name_index; -// u4 attribute_length; -// u2 local_variable_table_length; -// { u2 start_pc; -// u2 length; -// u2 name_index; -// u2 descriptor_index; -// u2 index; -// } local_variable_table[local_variable_table_length]; -// } - -//LocalVariableTypeTable_attribute { -// u2 attribute_name_index; -// u4 attribute_length; -// u2 local_variable_type_table_length; -// { -// u2 start_pc; -// u2 length; -// u2 name_index; -// u2 signature_index; -// u2 index; -// } localVariableTypeTable[local_variable_type_table_length]; -// } -// J5TODO: Needs some testing ! - -/** - * @since 6.0 - */ -public class LocalVariableTypeTable extends Attribute { - - private LocalVariable[] localVariableTypeTable; // variables - - public LocalVariableTypeTable(final LocalVariableTypeTable c) { - this(c.getNameIndex(), c.getLength(), c.getLocalVariableTypeTable(), c.getConstantPool()); - } - - public LocalVariableTypeTable(final int name_index, final int length, final LocalVariable[] local_variable_table, final ConstantPool constant_pool) { - super(Const.ATTR_LOCAL_VARIABLE_TYPE_TABLE, name_index, length, constant_pool); - this.localVariableTypeTable = local_variable_table; - } - - LocalVariableTypeTable(final int nameIdx, final int len, final DataInput input, final ConstantPool cpool) throws IOException { - this(nameIdx, len, (LocalVariable[]) null, cpool); - - final int local_variable_type_table_length = input.readUnsignedShort(); - localVariableTypeTable = new LocalVariable[local_variable_type_table_length]; - - for (int i = 0; i < local_variable_type_table_length; i++) { - localVariableTypeTable[i] = new LocalVariable(input, cpool); - } - } - - @Override - public void accept(final Visitor v) { - v.visitLocalVariableTypeTable(this); - } - - @Override - public final void dump(final DataOutputStream file) throws IOException { - super.dump(file); - file.writeShort(localVariableTypeTable.length); - for (final LocalVariable variable : localVariableTypeTable) { - variable.dump(file); - } - } - - public final LocalVariable[] getLocalVariableTypeTable() { - return localVariableTypeTable; - } - - public final LocalVariable getLocalVariable(final int index) { - for (final LocalVariable variable : localVariableTypeTable) { - if (variable.getIndex() == index) { - return variable; - } - } - - return null; - } - - public final void setLocalVariableTable(final LocalVariable[] local_variable_table) { - this.localVariableTypeTable = local_variable_table; - } - - /** - * @return String representation. - */ - @Override - public final String toString() { - final StringBuilder buf = new StringBuilder(); - - for (int i = 0; i < localVariableTypeTable.length; i++) { - buf.append(localVariableTypeTable[i].toStringShared(true)); - - if (i < localVariableTypeTable.length - 1) { - buf.append('\n'); - } - } - - return buf.toString(); - } - - /** - * @return deep copy of this attribute - */ - @Override - public Attribute copy(final ConstantPool constant_pool) { - final LocalVariableTypeTable c = (LocalVariableTypeTable) clone(); - - c.localVariableTypeTable = new LocalVariable[localVariableTypeTable.length]; - for (int i = 0; i < localVariableTypeTable.length; i++) { - c.localVariableTypeTable[i] = localVariableTypeTable[i].copy(); - } - - c.setConstantPool(constant_pool); - return c; - } - - public final int getTableLength() { - return localVariableTypeTable == null ? 0 : localVariableTypeTable.length; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/Method.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/Method.java deleted file mode 100644 index 8f9b8d6b..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/Method.java +++ /dev/null @@ -1,270 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.IOException; -import java.util.Objects; - -import org.apache.bcel.Const; -import org.apache.bcel.generic.Type; -import org.apache.bcel.util.BCELComparator; - -/** - * This class represents the method info structure, i.e., the representation - * for a method in the class. See JVM specification for details. - * A method has access flags, a name, a signature and a number of attributes. - * - */ -public final class Method extends FieldOrMethod { - - private static BCELComparator bcelComparator = new BCELComparator() { - - @Override - public boolean equals( final Object o1, final Object o2 ) { - final Method THIS = (Method) o1; - final Method THAT = (Method) o2; - return Objects.equals(THIS.getName(), THAT.getName()) - && Objects.equals(THIS.getSignature(), THAT.getSignature()); - } - - - @Override - public int hashCode( final Object o ) { - final Method THIS = (Method) o; - return THIS.getSignature().hashCode() ^ THIS.getName().hashCode(); - } - }; - - // annotations defined on the parameters of a method - private ParameterAnnotationEntry[] parameterAnnotationEntries; - - /** - * Empty constructor, all attributes have to be defined via `setXXX' - * methods. Use at your own risk. - */ - public Method() { - } - - - /** - * Initialize from another object. Note that both objects use the same - * references (shallow copy). Use clone() for a physical copy. - */ - public Method(final Method c) { - super(c); - } - - - /** - * Construct object from file stream. - * @param file Input stream - * @throws IOException - * @throws ClassFormatException - */ - Method(final DataInput file, final ConstantPool constant_pool) throws IOException, - ClassFormatException { - super(file, constant_pool); - } - - - /** - * @param access_flags Access rights of method - * @param name_index Points to field name in constant pool - * @param signature_index Points to encoded signature - * @param attributes Collection of attributes - * @param constant_pool Array of constants - */ - public Method(final int access_flags, final int name_index, final int signature_index, final Attribute[] attributes, - final ConstantPool constant_pool) { - super(access_flags, name_index, signature_index, attributes, constant_pool); - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitely - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitMethod(this); - } - - - /** - * @return Code attribute of method, if any - */ - public Code getCode() { - for (final Attribute attribute : super.getAttributes()) { - if (attribute instanceof Code) { - return (Code) attribute; - } - } - return null; - } - - - /** - * @return ExceptionTable attribute of method, if any, i.e., list all - * exceptions the method may throw not exception handlers! - */ - public ExceptionTable getExceptionTable() { - for (final Attribute attribute : super.getAttributes()) { - if (attribute instanceof ExceptionTable) { - return (ExceptionTable) attribute; - } - } - return null; - } - - - /** @return LocalVariableTable of code attribute if any, i.e. the call is forwarded - * to the Code atribute. - */ - public LocalVariableTable getLocalVariableTable() { - final Code code = getCode(); - if (code == null) { - return null; - } - return code.getLocalVariableTable(); - } - - - /** @return LineNumberTable of code attribute if any, i.e. the call is forwarded - * to the Code atribute. - */ - public LineNumberTable getLineNumberTable() { - final Code code = getCode(); - if (code == null) { - return null; - } - return code.getLineNumberTable(); - } - - - /** - * Return string representation close to declaration format, - * `public static void main(String[] args) throws IOException', e.g. - * - * @return String representation of the method. - */ - @Override - public String toString() { - final String access = Utility.accessToString(super.getAccessFlags()); - // Get name and signature from constant pool - ConstantUtf8 c = (ConstantUtf8) super.getConstantPool().getConstant(super.getSignatureIndex(), Const.CONSTANT_Utf8); - String signature = c.getBytes(); - c = (ConstantUtf8) super.getConstantPool().getConstant(super.getNameIndex(), Const.CONSTANT_Utf8); - final String name = c.getBytes(); - signature = Utility.methodSignatureToString(signature, name, access, true, - getLocalVariableTable()); - final StringBuilder buf = new StringBuilder(signature); - for (final Attribute attribute : super.getAttributes()) { - if (!((attribute instanceof Code) || (attribute instanceof ExceptionTable))) { - buf.append(" [").append(attribute).append("]"); - } - } - final ExceptionTable e = getExceptionTable(); - if (e != null) { - final String str = e.toString(); - if (!str.isEmpty()) { - buf.append("\n\t\tthrows ").append(str); - } - } - return buf.toString(); - } - - - /** - * @return deep copy of this method - */ - public Method copy( final ConstantPool _constant_pool ) { - return (Method) copy_(_constant_pool); - } - - - /** - * @return return type of method - */ - public Type getReturnType() { - return Type.getReturnType(getSignature()); - } - - - /** - * @return array of method argument types - */ - public Type[] getArgumentTypes() { - return Type.getArgumentTypes(getSignature()); - } - - - /** - * @return Comparison strategy object - */ - public static BCELComparator getComparator() { - return bcelComparator; - } - - - /** - * @param comparator Comparison strategy object - */ - public static void setComparator( final BCELComparator comparator ) { - bcelComparator = comparator; - } - - - /** - * Return value as defined by given BCELComparator strategy. - * By default two method objects are said to be equal when - * their names and signatures are equal. - * - * @see java.lang.Object#equals(java.lang.Object) - */ - @Override - public boolean equals( final Object obj ) { - return bcelComparator.equals(this, obj); - } - - - /** - * Return value as defined by given BCELComparator strategy. - * By default return the hashcode of the method's name XOR signature. - * - * @see java.lang.Object#hashCode() - */ - @Override - public int hashCode() { - return bcelComparator.hashCode(this); - } - - /** - * @return Annotations on the parameters of a method - * @since 6.0 - */ - public ParameterAnnotationEntry[] getParameterAnnotationEntries() { - if (parameterAnnotationEntries == null) { - parameterAnnotationEntries = ParameterAnnotationEntry.createParameterAnnotationEntries(getAttributes()); - } - return parameterAnnotationEntries; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/MethodParameter.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/MethodParameter.java deleted file mode 100644 index c3f448aa..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/MethodParameter.java +++ /dev/null @@ -1,120 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * Entry of the parameters table. - * - * @see - * The class File Format : The MethodParameters Attribute - * @since 6.0 - */ -public class MethodParameter implements Cloneable { - - /** Index of the CONSTANT_Utf8_info structure in the constant_pool table representing the name of the parameter */ - private int nameIndex; - - /** The access flags */ - private int accessFlags; - - public MethodParameter() { - } - - /** - * Construct object from input stream. - * - * @param input Input stream - * @throws java.io.IOException - * @throws ClassFormatException - */ - MethodParameter(final DataInput input) throws IOException { - nameIndex = input.readUnsignedShort(); - accessFlags = input.readUnsignedShort(); - } - - public int getNameIndex() { - return nameIndex; - } - - public void setNameIndex(final int name_index) { - this.nameIndex = name_index; - } - - /** - * Returns the name of the parameter. - */ - public String getParameterName(final ConstantPool constant_pool) { - if (nameIndex == 0) { - return null; - } - return ((ConstantUtf8) constant_pool.getConstant(nameIndex, Const.CONSTANT_Utf8)).getBytes(); - } - - public int getAccessFlags() { - return accessFlags; - } - - public void setAccessFlags(final int access_flags) { - this.accessFlags = access_flags; - } - - public boolean isFinal() { - return (accessFlags & Const.ACC_FINAL) != 0; - } - - public boolean isSynthetic() { - return (accessFlags & Const.ACC_SYNTHETIC) != 0; - } - - public boolean isMandated() { - return (accessFlags & Const.ACC_MANDATED) != 0; - } - - public void accept(final Visitor v) { - v.visitMethodParameter(this); - } - - /** - * Dump object to file stream on binary format. - * - * @param file Output file stream - * @throws IOException - */ - public final void dump(final DataOutputStream file) throws IOException { - file.writeShort(nameIndex); - file.writeShort(accessFlags); - } - - /** - * @return deep copy of this object - */ - public MethodParameter copy() { - try { - return (MethodParameter) clone(); - } catch (final CloneNotSupportedException e) { - // TODO should this throw? - } - return null; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/MethodParameters.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/MethodParameters.java deleted file mode 100644 index b8114367..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/MethodParameters.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * This class represents a MethodParameters attribute. - * - * @see - * The class File Format : The MethodParameters Attribute - * @since 6.0 - */ -public class MethodParameters extends Attribute { - - private MethodParameter[] parameters = new MethodParameter[0]; - - MethodParameters(final int name_index, final int length, final DataInput input, final ConstantPool constant_pool) throws IOException { - super(Const.ATTR_METHOD_PARAMETERS, name_index, length, constant_pool); - - final int parameters_count = input.readUnsignedByte(); - parameters = new MethodParameter[parameters_count]; - for (int i = 0; i < parameters_count; i++) { - parameters[i] = new MethodParameter(input); - } - } - - public MethodParameter[] getParameters() { - return parameters; - } - - public void setParameters(final MethodParameter[] parameters) { - this.parameters = parameters; - } - - @Override - public void accept(final Visitor v) { - v.visitMethodParameters(this); - } - - @Override - public Attribute copy(final ConstantPool _constant_pool) { - final MethodParameters c = (MethodParameters) clone(); - c.parameters = new MethodParameter[parameters.length]; - - for (int i = 0; i < parameters.length; i++) { - c.parameters[i] = parameters[i].copy(); - } - c.setConstantPool(_constant_pool); - return c; - } - - /** - * Dump method parameters attribute to file stream in binary format. - * - * @param file Output file stream - * @throws IOException - */ - @Override - public void dump(final DataOutputStream file) throws IOException { - super.dump(file); - file.writeByte(parameters.length); - for (final MethodParameter parameter : parameters) { - parameter.dump(file); - } - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/Module.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/Module.java deleted file mode 100644 index 0e1330e1..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/Module.java +++ /dev/null @@ -1,257 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * This class is derived from Attribute and represents the list of modules required, exported, opened or provided by a module. - * There may be at most one Module attribute in a ClassFile structure. - * - * @see Attribute - * @since 6.4.0 - */ -public final class Module extends Attribute { - - private final int moduleNameIndex; - private final int moduleFlags; - private final int moduleVersionIndex; - - private ModuleRequires[] requiresTable; - private ModuleExports[] exportsTable; - private ModuleOpens[] opensTable; - private final int usesCount; - private final int[] usesIndex; - private ModuleProvides[] providesTable; - - /** - * Construct object from input stream. - * @param name_index Index in constant pool - * @param length Content length in bytes - * @param input Input stream - * @param constant_pool Array of constants - * @throws IOException - */ - Module(final int name_index, final int length, final DataInput input, final ConstantPool constant_pool) throws IOException { - super(Const.ATTR_MODULE, name_index, length, constant_pool); - - moduleNameIndex = input.readUnsignedShort(); - moduleFlags = input.readUnsignedShort(); - moduleVersionIndex = input.readUnsignedShort(); - - final int requires_count = input.readUnsignedShort(); - requiresTable = new ModuleRequires[requires_count]; - for (int i = 0; i < requires_count; i++) { - requiresTable[i] = new ModuleRequires(input); - } - - final int exports_count = input.readUnsignedShort(); - exportsTable = new ModuleExports[exports_count]; - for (int i = 0; i < exports_count; i++) { - exportsTable[i] = new ModuleExports(input); - } - - final int opens_count = input.readUnsignedShort(); - opensTable = new ModuleOpens[opens_count]; - for (int i = 0; i < opens_count; i++) { - opensTable[i] = new ModuleOpens(input); - } - - usesCount = input.readUnsignedShort(); - usesIndex = new int[usesCount]; - for (int i = 0; i < usesCount; i++) { - usesIndex[i] = input.readUnsignedShort(); - } - - final int provides_count = input.readUnsignedShort(); - providesTable = new ModuleProvides[provides_count]; - for (int i = 0; i < provides_count; i++) { - providesTable[i] = new ModuleProvides(input); - } - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitely - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitModule(this); - } - - // TODO add more getters and setters? - - /** - * @return table of required modules - * @see ModuleRequires - */ - public ModuleRequires[] getRequiresTable() { - return requiresTable; - } - - - /** - * @return table of exported interfaces - * @see ModuleExports - */ - public ModuleExports[] getExportsTable() { - return exportsTable; - } - - - /** - * @return table of provided interfaces - * @see ModuleOpens - */ - public ModuleOpens[] getOpensTable() { - return opensTable; - } - - - /** - * @return table of provided interfaces - * @see ModuleProvides - */ - public ModuleProvides[] getProvidesTable() { - return providesTable; - } - - - /** - * Dump Module attribute to file stream in binary format. - * - * @param file Output file stream - * @throws IOException - */ - @Override - public void dump( final DataOutputStream file ) throws IOException { - super.dump(file); - - file.writeShort(moduleNameIndex); - file.writeShort(moduleFlags); - file.writeShort(moduleVersionIndex); - - file.writeShort(requiresTable.length); - for (final ModuleRequires entry : requiresTable) { - entry.dump(file); - } - - file.writeShort(exportsTable.length); - for (final ModuleExports entry : exportsTable) { - entry.dump(file); - } - - file.writeShort(opensTable.length); - for (final ModuleOpens entry : opensTable) { - entry.dump(file); - } - - file.writeShort(usesIndex.length); - for (final int entry : usesIndex) { - file.writeShort(entry); - } - - file.writeShort(providesTable.length); - for (final ModuleProvides entry : providesTable) { - entry.dump(file); - } - } - - - /** - * @return String representation, i.e., a list of packages. - */ - @Override - public String toString() { - final ConstantPool cp = super.getConstantPool(); - final StringBuilder buf = new StringBuilder(); - buf.append("Module:\n"); - buf.append(" name: ") .append(cp.getConstantString(moduleNameIndex, Const.CONSTANT_Module).replace('/', '.')).append("\n"); - buf.append(" flags: ") .append(String.format("%04x", moduleFlags)).append("\n"); - final String version = moduleVersionIndex == 0 ? "0" : cp.getConstantString(moduleVersionIndex, Const.CONSTANT_Utf8); - buf.append(" version: ") .append(version).append("\n"); - - buf.append(" requires(").append(requiresTable.length).append("):\n"); - for (final ModuleRequires module : requiresTable) { - buf.append(" ").append(module.toString(cp)).append("\n"); - } - - buf.append(" exports(").append(exportsTable.length).append("):\n"); - for (final ModuleExports module : exportsTable) { - buf.append(" ").append(module.toString(cp)).append("\n"); - } - - buf.append(" opens(").append(opensTable.length).append("):\n"); - for (final ModuleOpens module : opensTable) { - buf.append(" ").append(module.toString(cp)).append("\n"); - } - - buf.append(" uses(").append(usesIndex.length).append("):\n"); - for (final int index : usesIndex) { - final String class_name = cp.getConstantString(index, Const.CONSTANT_Class); - buf.append(" ").append(Utility.compactClassName(class_name, false)).append("\n"); - } - - buf.append(" provides(").append(providesTable.length).append("):\n"); - for (final ModuleProvides module : providesTable) { - buf.append(" ").append(module.toString(cp)).append("\n"); - } - - return buf.substring(0, buf.length()-1); // remove the last newline - } - - - /** - * @return deep copy of this attribute - */ - @Override - public Attribute copy( final ConstantPool _constant_pool ) { - final Module c = (Module) clone(); - - c.requiresTable = new ModuleRequires[requiresTable.length]; - for (int i = 0; i < requiresTable.length; i++) { - c.requiresTable[i] = requiresTable[i].copy(); - } - - c.exportsTable = new ModuleExports[exportsTable.length]; - for (int i = 0; i < exportsTable.length; i++) { - c.exportsTable[i] = exportsTable[i].copy(); - } - - c.opensTable = new ModuleOpens[opensTable.length]; - for (int i = 0; i < opensTable.length; i++) { - c.opensTable[i] = opensTable[i].copy(); - } - - c.providesTable = new ModuleProvides[providesTable.length]; - for (int i = 0; i < providesTable.length; i++) { - c.providesTable[i] = providesTable[i].copy(); - } - - c.setConstantPool(_constant_pool); - return c; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ModuleExports.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ModuleExports.java deleted file mode 100644 index 487671c1..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ModuleExports.java +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * This class represents an entry in the exports table of the Module attribute. - * Each entry describes a package which may open the parent module. - * - * @see Module - * @since 6.4.0 - */ -public final class ModuleExports implements Cloneable, Node { - - private final int exportsIndex; // points to CONSTANT_Package_info - private final int exportsFlags; - private final int exportsToCount; - private final int[] exportsToIndex; // points to CONSTANT_Module_info - - - /** - * Construct object from file stream. - * - * @param file Input stream - * @throws IOException if an I/O Exception occurs in readUnsignedShort - */ - ModuleExports(final DataInput file) throws IOException { - exportsIndex = file.readUnsignedShort(); - exportsFlags = file.readUnsignedShort(); - exportsToCount = file.readUnsignedShort(); - exportsToIndex = new int[exportsToCount]; - for (int i = 0; i < exportsToCount; i++) { - exportsToIndex[i] = file.readUnsignedShort(); - } - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitely - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitModuleExports(this); - } - - // TODO add more getters and setters? - - /** - * Dump table entry to file stream in binary format. - * - * @param file Output file stream - * @throws IOException if an I/O Exception occurs in writeShort - */ - public void dump( final DataOutputStream file ) throws IOException { - file.writeShort(exportsIndex); - file.writeShort(exportsFlags); - file.writeShort(exportsToCount); - for (final int entry : exportsToIndex) { - file.writeShort(entry); - } - } - - - /** - * @return String representation - */ - @Override - public String toString() { - return "exports(" + exportsIndex + ", " + exportsFlags + ", " + exportsToCount + ", ...)"; - } - - - /** - * @return Resolved string representation - */ - public String toString( final ConstantPool constant_pool ) { - final StringBuilder buf = new StringBuilder(); - final String package_name = constant_pool.constantToString(exportsIndex, Const.CONSTANT_Package); - buf.append(Utility.compactClassName(package_name, false)); - buf.append(", ").append(String.format("%04x", exportsFlags)); - buf.append(", to(").append(exportsToCount).append("):\n"); - for (final int index : exportsToIndex) { - final String module_name = constant_pool.getConstantString(index, Const.CONSTANT_Module); - buf.append(" ").append(Utility.compactClassName(module_name, false)).append("\n"); - } - return buf.substring(0, buf.length()-1); // remove the last newline - } - - - /** - * @return deep copy of this object - */ - public ModuleExports copy() { - try { - return (ModuleExports) clone(); - } catch (final CloneNotSupportedException e) { - // TODO should this throw? - } - return null; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ModuleMainClass.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ModuleMainClass.java deleted file mode 100644 index 6b69888c..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ModuleMainClass.java +++ /dev/null @@ -1,137 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * This class is derived from Attribute and indicates the main class of a module. - * There may be at most one ModuleMainClass attribute in a ClassFile structure. - * - * @see Attribute - */ -public final class ModuleMainClass extends Attribute { - - private int mainClassIndex; - - - /** - * Initialize from another object. Note that both objects use the same - * references (shallow copy). Use copy() for a physical copy. - */ - public ModuleMainClass(final ModuleMainClass c) { - this(c.getNameIndex(), c.getLength(), c.getHostClassIndex(), c.getConstantPool()); - } - - - /** - * @param name_index Index in constant pool - * @param length Content length in bytes - * @param mainClassIndex Host class index - * @param constantPool Array of constants - */ - public ModuleMainClass(final int name_index, final int length, final int mainClassIndex, - final ConstantPool constantPool) { - super(Const.ATTR_NEST_MEMBERS, name_index, length, constantPool); - this.mainClassIndex = mainClassIndex; - } - - - /** - * Construct object from input stream. - * @param nameIndex Index in constant pool - * @param length Content length in bytes - * @param input Input stream - * @param constantPool Array of constants - * @throws IOException - */ - ModuleMainClass(final int nameIndex, final int length, final DataInput input, final ConstantPool constantPool) throws IOException { - this(nameIndex, length, 0, constantPool); - mainClassIndex = input.readUnsignedShort(); - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitly - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitModuleMainClass(this); - } - - - /** - * Dump ModuleMainClass attribute to file stream in binary format. - * - * @param file Output file stream - * @throws IOException if an I/O error occurs. - */ - @Override - public void dump( final DataOutputStream file ) throws IOException { - super.dump(file); - file.writeShort(mainClassIndex); - } - - - /** - * @return index into constant pool of host class name. - */ - public int getHostClassIndex() { - return mainClassIndex; - } - - - /** - * @param mainClassIndex the host class index - */ - public void setHostClassIndex( final int mainClassIndex ) { - this.mainClassIndex = mainClassIndex; - } - - - /** - * @return String representation - */ - @Override - public String toString() { - final StringBuilder buf = new StringBuilder(); - buf.append("ModuleMainClass: "); - final String class_name = super.getConstantPool().getConstantString(mainClassIndex, Const.CONSTANT_Class); - buf.append(Utility.compactClassName(class_name, false)); - return buf.toString(); - } - - - /** - * @return deep copy of this attribute - */ - @Override - public Attribute copy( final ConstantPool _constant_pool ) { - final ModuleMainClass c = (ModuleMainClass) clone(); - c.setConstantPool(_constant_pool); - return c; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ModuleOpens.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ModuleOpens.java deleted file mode 100644 index a06a6cf8..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ModuleOpens.java +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * This class represents an entry in the opens table of the Module attribute. - * Each entry describes a package which the parent module opens. - * - * @see Module - * @since 6.4.0 - */ -public final class ModuleOpens implements Cloneable, Node { - - private final int opensIndex; // points to CONSTANT_Package_info - private final int opensFlags; - private final int opensToCount; - private final int[] opensToIndex; // points to CONSTANT_Module_info - - - /** - * Construct object from file stream. - * - * @param file Input stream - * @throws IOException if an I/O Exception occurs in readUnsignedShort - */ - ModuleOpens(final DataInput file) throws IOException { - opensIndex = file.readUnsignedShort(); - opensFlags = file.readUnsignedShort(); - opensToCount = file.readUnsignedShort(); - opensToIndex = new int[opensToCount]; - for (int i = 0; i < opensToCount; i++) { - opensToIndex[i] = file.readUnsignedShort(); - } - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitely - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitModuleOpens(this); - } - - // TODO add more getters and setters? - - /** - * Dump table entry to file stream in binary format. - * - * @param file Output file stream - * @throws IOException if an I/O Exception occurs in writeShort - */ - public void dump( final DataOutputStream file ) throws IOException { - file.writeShort(opensIndex); - file.writeShort(opensFlags); - file.writeShort(opensToCount); - for (final int entry : opensToIndex) { - file.writeShort(entry); - } - } - - - /** - * @return String representation - */ - @Override - public String toString() { - return "opens(" + opensIndex + ", " + opensFlags + ", " + opensToCount + ", ...)"; - } - - - /** - * @return Resolved string representation - */ - public String toString( final ConstantPool constant_pool ) { - final StringBuilder buf = new StringBuilder(); - final String package_name = constant_pool.constantToString(opensIndex, Const.CONSTANT_Package); - buf.append(Utility.compactClassName(package_name, false)); - buf.append(", ").append(String.format("%04x", opensFlags)); - buf.append(", to(").append(opensToCount).append("):\n"); - for (final int index : opensToIndex) { - final String module_name = constant_pool.getConstantString(index, Const.CONSTANT_Module); - buf.append(" ").append(Utility.compactClassName(module_name, false)).append("\n"); - } - return buf.substring(0, buf.length()-1); // remove the last newline - } - - - /** - * @return deep copy of this object - */ - public ModuleOpens copy() { - try { - return (ModuleOpens) clone(); - } catch (final CloneNotSupportedException e) { - // TODO should this throw? - } - return null; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ModulePackages.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ModulePackages.java deleted file mode 100644 index e6aa3078..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ModulePackages.java +++ /dev/null @@ -1,175 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * This class is derived from Attribute and represents the list of packages that are exported or opened by the Module attribute. - * There may be at most one ModulePackages attribute in a ClassFile structure. - * - * @see Attribute - */ -public final class ModulePackages extends Attribute { - - private int[] packageIndexTable; - - - /** - * Initialize from another object. Note that both objects use the same - * references (shallow copy). Use copy() for a physical copy. - */ - public ModulePackages(final ModulePackages c) { - this(c.getNameIndex(), c.getLength(), c.getPackageIndexTable(), c.getConstantPool()); - } - - - /** - * @param nameIndex Index in constant pool - * @param length Content length in bytes - * @param packageIndexTable Table of indices in constant pool - * @param constantPool Array of constants - */ - public ModulePackages(final int nameIndex, final int length, final int[] packageIndexTable, - final ConstantPool constantPool) { - super(Const.ATTR_MODULE_PACKAGES, nameIndex, length, constantPool); - this.packageIndexTable = packageIndexTable != null ? packageIndexTable : new int[0]; - } - - - /** - * Construct object from input stream. - * @param name_index Index in constant pool - * @param length Content length in bytes - * @param input Input stream - * @param constant_pool Array of constants - * @throws IOException - */ - ModulePackages(final int name_index, final int length, final DataInput input, final ConstantPool constant_pool) throws IOException { - this(name_index, length, (int[]) null, constant_pool); - final int number_of_packages = input.readUnsignedShort(); - packageIndexTable = new int[number_of_packages]; - for (int i = 0; i < number_of_packages; i++) { - packageIndexTable[i] = input.readUnsignedShort(); - } - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitely - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitModulePackages(this); - } - - - /** - * Dump ModulePackages attribute to file stream in binary format. - * - * @param file Output file stream - * @throws IOException - */ - @Override - public void dump( final DataOutputStream file ) throws IOException { - super.dump(file); - file.writeShort(packageIndexTable.length); - for (final int index : packageIndexTable) { - file.writeShort(index); - } - } - - - /** - * @return array of indices into constant pool of package names. - */ - public int[] getPackageIndexTable() { - return packageIndexTable; - } - - - /** - * @return Length of package table. - */ - public int getNumberOfPackages() { - return packageIndexTable == null ? 0 : packageIndexTable.length; - } - - - /** - * @return string array of package names - */ - public String[] getPackageNames() { - final String[] names = new String[packageIndexTable.length]; - for (int i = 0; i < packageIndexTable.length; i++) { - names[i] = super.getConstantPool().getConstantString(packageIndexTable[i], - Const.CONSTANT_Package).replace('/', '.'); - } - return names; - } - - - /** - * @param packageIndexTable the list of package indexes - * Also redefines number_of_packages according to table length. - */ - public void setPackageIndexTable( final int[] packageIndexTable ) { - this.packageIndexTable = packageIndexTable != null ? packageIndexTable : new int[0]; - } - - - /** - * @return String representation, i.e., a list of packages. - */ - @Override - public String toString() { - final StringBuilder buf = new StringBuilder(); - buf.append("ModulePackages("); - buf.append(packageIndexTable.length); - buf.append("):\n"); - for (final int index : packageIndexTable) { - final String package_name = super.getConstantPool().getConstantString(index, Const.CONSTANT_Package); - buf.append(" ").append(Utility.compactClassName(package_name, false)).append("\n"); - } - return buf.substring(0, buf.length()-1); // remove the last newline - } - - - /** - * @return deep copy of this attribute - */ - @Override - public Attribute copy( final ConstantPool _constant_pool ) { - final ModulePackages c = (ModulePackages) clone(); - if (packageIndexTable != null) { - c.packageIndexTable = new int[packageIndexTable.length]; - System.arraycopy(packageIndexTable, 0, c.packageIndexTable, 0, - packageIndexTable.length); - } - c.setConstantPool(_constant_pool); - return c; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ModuleProvides.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ModuleProvides.java deleted file mode 100644 index 990059d7..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ModuleProvides.java +++ /dev/null @@ -1,121 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * This class represents an entry in the provides table of the Module attribute. - * Each entry describes a service implementation that the parent module provides. - * - * @see Module - * @since 6.4.0 - */ -public final class ModuleProvides implements Cloneable, Node { - - private final int providesIndex; // points to CONSTANT_Class_info - private final int providesWithCount; - private final int[] providesWithIndex; // points to CONSTANT_Class_info - - - /** - * Construct object from file stream. - * - * @param file Input stream - * @throws IOException if an I/O Exception occurs in readUnsignedShort - */ - ModuleProvides(final DataInput file) throws IOException { - providesIndex = file.readUnsignedShort(); - providesWithCount = file.readUnsignedShort(); - providesWithIndex = new int[providesWithCount]; - for (int i = 0; i < providesWithCount; i++) { - providesWithIndex[i] = file.readUnsignedShort(); - } - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitely - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitModuleProvides(this); - } - - // TODO add more getters and setters? - - /** - * Dump table entry to file stream in binary format. - * - * @param file Output file stream - * @throws IOException if an I/O Exception occurs in writeShort - */ - public void dump( final DataOutputStream file ) throws IOException { - file.writeShort(providesIndex); - file.writeShort(providesWithCount); - for (final int entry : providesWithIndex) { - file.writeShort(entry); - } - } - - - /** - * @return String representation - */ - @Override - public String toString() { - return "provides(" + providesIndex + ", " + providesWithCount + ", ...)"; - } - - - /** - * @return Resolved string representation - */ - public String toString( final ConstantPool constant_pool ) { - final StringBuilder buf = new StringBuilder(); - final String interface_name = constant_pool.constantToString(providesIndex, Const.CONSTANT_Class); - buf.append(Utility.compactClassName(interface_name, false)); - buf.append(", with(").append(providesWithCount).append("):\n"); - for (final int index : providesWithIndex) { - final String class_name = constant_pool.getConstantString(index, Const.CONSTANT_Class); - buf.append(" ").append(Utility.compactClassName(class_name, false)).append("\n"); - } - return buf.substring(0, buf.length()-1); // remove the last newline - } - - - /** - * @return deep copy of this object - */ - public ModuleProvides copy() { - try { - return (ModuleProvides) clone(); - } catch (final CloneNotSupportedException e) { - // TODO should this throw? - } - return null; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ModuleRequires.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ModuleRequires.java deleted file mode 100644 index 20e2b36c..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ModuleRequires.java +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * This class represents an entry in the requires table of the Module attribute. - * Each entry describes a module on which the parent module depends. - * - * @see Module - * @since 6.4.0 - */ -public final class ModuleRequires implements Cloneable, Node { - - private final int requiresIndex; // points to CONSTANT_Module_info - private final int requiresFlags; - private final int requiresVersionIndex; // either 0 or points to CONSTANT_Utf8_info - - - /** - * Construct object from file stream. - * - * @param file Input stream - * @throws IOException if an I/O Exception occurs in readUnsignedShort - */ - ModuleRequires(final DataInput file) throws IOException { - requiresIndex = file.readUnsignedShort(); - requiresFlags = file.readUnsignedShort(); - requiresVersionIndex = file.readUnsignedShort(); - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitely - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitModuleRequires(this); - } - - // TODO add more getters and setters? - - /** - * Dump table entry to file stream in binary format. - * - * @param file Output file stream - * @throws IOException if an I/O Exception occurs in writeShort - */ - public void dump( final DataOutputStream file ) throws IOException { - file.writeShort(requiresIndex); - file.writeShort(requiresFlags); - file.writeShort(requiresVersionIndex); - } - - - /** - * @return String representation - */ - @Override - public String toString() { - return "requires(" + requiresIndex + ", " + String.format("%04x", requiresFlags) + ", " + requiresVersionIndex + ")"; - } - - - /** - * @return Resolved string representation - */ - public String toString( final ConstantPool constant_pool ) { - final StringBuilder buf = new StringBuilder(); - final String module_name = constant_pool.constantToString(requiresIndex, Const.CONSTANT_Module); - buf.append(Utility.compactClassName(module_name, false)); - buf.append(", ").append(String.format("%04x", requiresFlags)); - final String version = requiresVersionIndex == 0 ? "0" : constant_pool.getConstantString(requiresVersionIndex, Const.CONSTANT_Utf8); - buf.append(", ").append(version); - return buf.toString(); - } - - - /** - * @return deep copy of this object - */ - public ModuleRequires copy() { - try { - return (ModuleRequires) clone(); - } catch (final CloneNotSupportedException e) { - // TODO should this throw? - } - return null; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/NestHost.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/NestHost.java deleted file mode 100644 index 7dc561f1..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/NestHost.java +++ /dev/null @@ -1,138 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * This class is derived from Attribute and records the nest host of the nest - * to which the current class or interface claims to belong. - * There may be at most one NestHost attribute in a ClassFile structure. - * - * @see Attribute - */ -public final class NestHost extends Attribute { - - private int hostClassIndex; - - - /** - * Initializes from another object. Note that both objects use the same - * references (shallow copy). Use copy() for a physical copy. - */ - public NestHost(final NestHost c) { - this(c.getNameIndex(), c.getLength(), c.getHostClassIndex(), c.getConstantPool()); - } - - - /** - * @param nameIndex Index in constant pool - * @param length Content length in bytes - * @param hostClassIndex Host class index - * @param constantPool Array of constants - */ - public NestHost(final int nameIndex, final int length, final int hostClassIndex, - final ConstantPool constantPool) { - super(Const.ATTR_NEST_MEMBERS, nameIndex, length, constantPool); - this.hostClassIndex = hostClassIndex; - } - - - /** - * Constructs object from input stream. - * @param name_index Index in constant pool - * @param length Content length in bytes - * @param input Input stream - * @param constant_pool Array of constants - * @throws IOException - */ - NestHost(final int name_index, final int length, final DataInput input, final ConstantPool constant_pool) throws IOException { - this(name_index, length, 0, constant_pool); - hostClassIndex = input.readUnsignedShort(); - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitely - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitNestHost(this); - } - - - /** - * Dumps NestHost attribute to file stream in binary format. - * - * @param file Output file stream - * @throws IOException if an I/O error occurs. - */ - @Override - public void dump( final DataOutputStream file ) throws IOException { - super.dump(file); - file.writeShort(hostClassIndex); - } - - - /** - * @return index into constant pool of host class name. - */ - public int getHostClassIndex() { - return hostClassIndex; - } - - - /** - * @param hostClassIndex the host class index - */ - public void setHostClassIndex( final int hostClassIndex ) { - this.hostClassIndex = hostClassIndex; - } - - - /** - * @return String representation - */ - @Override - public String toString() { - final StringBuilder buf = new StringBuilder(); - buf.append("NestHost: "); - final String class_name = super.getConstantPool().getConstantString(hostClassIndex, Const.CONSTANT_Class); - buf.append(Utility.compactClassName(class_name, false)); - return buf.toString(); - } - - - /** - * @return deep copy of this attribute - */ - @Override - public Attribute copy( final ConstantPool _constant_pool ) { - final NestHost c = (NestHost) clone(); - c.setConstantPool(_constant_pool); - return c; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/NestMembers.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/NestMembers.java deleted file mode 100644 index 4dbb185d..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/NestMembers.java +++ /dev/null @@ -1,176 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * This class is derived from Attribute and records the classes and interfaces that - * are authorized to claim membership in the nest hosted by the current class or interface. - * There may be at most one NestMembers attribute in a ClassFile structure. - * - * @see Attribute - */ -public final class NestMembers extends Attribute { - - private int[] classes; - - - /** - * Initialize from another object. Note that both objects use the same - * references (shallow copy). Use copy() for a physical copy. - */ - public NestMembers(final NestMembers c) { - this(c.getNameIndex(), c.getLength(), c.getClasses(), c.getConstantPool()); - } - - - /** - * @param name_index Index in constant pool - * @param length Content length in bytes - * @param classes Table of indices in constant pool - * @param constant_pool Array of constants - */ - public NestMembers(final int name_index, final int length, final int[] classes, - final ConstantPool constant_pool) { - super(Const.ATTR_NEST_MEMBERS, name_index, length, constant_pool); - this.classes = classes != null ? classes : new int[0]; - } - - - /** - * Construct object from input stream. - * @param name_index Index in constant pool - * @param length Content length in bytes - * @param input Input stream - * @param constant_pool Array of constants - * @throws IOException - */ - NestMembers(final int name_index, final int length, final DataInput input, final ConstantPool constant_pool) throws IOException { - this(name_index, length, (int[]) null, constant_pool); - final int number_of_classes = input.readUnsignedShort(); - classes = new int[number_of_classes]; - for (int i = 0; i < number_of_classes; i++) { - classes[i] = input.readUnsignedShort(); - } - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitely - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitNestMembers(this); - } - - - /** - * Dump NestMembers attribute to file stream in binary format. - * - * @param file Output file stream - * @throws IOException - */ - @Override - public void dump( final DataOutputStream file ) throws IOException { - super.dump(file); - file.writeShort(classes.length); - for (final int index : classes) { - file.writeShort(index); - } - } - - - /** - * @return array of indices into constant pool of class names. - */ - public int[] getClasses() { - return classes; - } - - - /** - * @return Length of classes table. - */ - public int getNumberClasses() { - return classes == null ? 0 : classes.length; - } - - - /** - * @return string array of class names - */ - public String[] getClassNames() { - final String[] names = new String[classes.length]; - for (int i = 0; i < classes.length; i++) { - names[i] = super.getConstantPool().getConstantString(classes[i], - Const.CONSTANT_Class).replace('/', '.'); - } - return names; - } - - - /** - * @param classes the list of class indexes - * Also redefines number_of_classes according to table length. - */ - public void setClasses( final int[] classes ) { - this.classes = classes != null ? classes : new int[0]; - } - - - /** - * @return String representation, i.e., a list of classes. - */ - @Override - public String toString() { - final StringBuilder buf = new StringBuilder(); - buf.append("NestMembers("); - buf.append(classes.length); - buf.append("):\n"); - for (final int index : classes) { - final String class_name = super.getConstantPool().getConstantString(index, Const.CONSTANT_Class); - buf.append(" ").append(Utility.compactClassName(class_name, false)).append("\n"); - } - return buf.substring(0, buf.length()-1); // remove the last newline - } - - - /** - * @return deep copy of this attribute - */ - @Override - public Attribute copy( final ConstantPool _constant_pool ) { - final NestMembers c = (NestMembers) clone(); - if (classes != null) { - c.classes = new int[classes.length]; - System.arraycopy(classes, 0, c.classes, 0, - classes.length); - } - c.setConstantPool(_constant_pool); - return c; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/Node.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/Node.java deleted file mode 100644 index 2f358f6a..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/Node.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -/** - * Denote class to have an accept method(); - * - */ -public interface Node { - - void accept( Visitor obj ); -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/PMGClass.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/PMGClass.java deleted file mode 100644 index b03efd27..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/PMGClass.java +++ /dev/null @@ -1,172 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * This class is derived from Attribute and represents a reference - * to a PMG attribute. - * - * @see Attribute - */ -public final class PMGClass extends Attribute { - - private int pmgClassIndex; - private int pmgIndex; - - - /** - * Initialize from another object. Note that both objects use the same - * references (shallow copy). Use copy() for a physical copy. - */ - public PMGClass(final PMGClass pgmClass) { - this(pgmClass.getNameIndex(), pgmClass.getLength(), pgmClass.getPMGIndex(), pgmClass.getPMGClassIndex(), - pgmClass.getConstantPool()); - } - - - /** - * Construct object from input stream. - * @param name_index Index in constant pool to CONSTANT_Utf8 - * @param length Content length in bytes - * @param input Input stream - * @param constant_pool Array of constants - * @throws IOException - */ - PMGClass(final int name_index, final int length, final DataInput input, final ConstantPool constant_pool) - throws IOException { - this(name_index, length, input.readUnsignedShort(), input.readUnsignedShort(), constant_pool); - } - - - /** - * @param name_index Index in constant pool to CONSTANT_Utf8 - * @param length Content length in bytes - * @param pmgIndex index in constant pool for source file name - * @param pmgClassIndex Index in constant pool to CONSTANT_Utf8 - * @param constantPool Array of constants - */ - public PMGClass(final int name_index, final int length, final int pmgIndex, final int pmgClassIndex, - final ConstantPool constantPool) { - super(Const.ATTR_PMG, name_index, length, constantPool); - this.pmgIndex = pmgIndex; - this.pmgClassIndex = pmgClassIndex; - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitely - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - println("Visiting non-standard PMGClass object"); - } - - - /** - * Dump source file attribute to file stream in binary format. - * - * @param file Output file stream - * @throws IOException - */ - @Override - public void dump( final DataOutputStream file ) throws IOException { - super.dump(file); - file.writeShort(pmgIndex); - file.writeShort(pmgClassIndex); - } - - - /** - * @return Index in constant pool of source file name. - */ - public int getPMGClassIndex() { - return pmgClassIndex; - } - - - /** - * @param pmgClassIndex - */ - public void setPMGClassIndex( final int pmgClassIndex ) { - this.pmgClassIndex = pmgClassIndex; - } - - - /** - * @return Index in constant pool of source file name. - */ - public int getPMGIndex() { - return pmgIndex; - } - - - /** - * @param pmgIndex - */ - public void setPMGIndex( final int pmgIndex ) { - this.pmgIndex = pmgIndex; - } - - - /** - * @return PMG name. - */ - public String getPMGName() { - final ConstantUtf8 c = (ConstantUtf8) super.getConstantPool().getConstant(pmgIndex, - Const.CONSTANT_Utf8); - return c.getBytes(); - } - - - /** - * @return PMG class name. - */ - public String getPMGClassName() { - final ConstantUtf8 c = (ConstantUtf8) super.getConstantPool().getConstant(pmgClassIndex, - Const.CONSTANT_Utf8); - return c.getBytes(); - } - - - /** - * @return String representation - */ - @Override - public String toString() { - return "PMGClass(" + getPMGName() + ", " + getPMGClassName() + ")"; - } - - - /** - * @return deep copy of this attribute - */ - @Override - public Attribute copy( final ConstantPool _constant_pool ) { - return (Attribute) clone(); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ParameterAnnotationEntry.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ParameterAnnotationEntry.java deleted file mode 100644 index c8cc6807..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ParameterAnnotationEntry.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -/** - * represents one parameter annotation in the parameter annotation table - * - * @since 6.0 - */ -public class ParameterAnnotationEntry implements Node { - - private final AnnotationEntry[] annotationTable; - - - /** - * Construct object from input stream. - * - * @param input Input stream - * @throws IOException - */ - ParameterAnnotationEntry(final DataInput input, final ConstantPool constant_pool) throws IOException { - final int annotation_table_length = input.readUnsignedShort(); - annotationTable = new AnnotationEntry[annotation_table_length]; - for (int i = 0; i < annotation_table_length; i++) { - // TODO isRuntimeVisible - annotationTable[i] = AnnotationEntry.read(input, constant_pool, false); - } - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitely - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitParameterAnnotationEntry(this); - } - - /** - * returns the array of annotation entries in this annotation - */ - public AnnotationEntry[] getAnnotationEntries() { - return annotationTable; - } - - public void dump(final DataOutputStream dos) throws IOException { - dos.writeShort(annotationTable.length); - for (final AnnotationEntry entry : annotationTable) { - entry.dump(dos); - } - } - - public static ParameterAnnotationEntry[] createParameterAnnotationEntries(final Attribute[] attrs) { - // Find attributes that contain parameter annotation data - final List accumulatedAnnotations = new ArrayList<>(attrs.length); - for (final Attribute attribute : attrs) { - if (attribute instanceof ParameterAnnotations) { - final ParameterAnnotations runtimeAnnotations = (ParameterAnnotations)attribute; - Collections.addAll(accumulatedAnnotations, runtimeAnnotations.getParameterAnnotationEntries()); - } - } - return accumulatedAnnotations.toArray(new ParameterAnnotationEntry[accumulatedAnnotations.size()]); - } -} - diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ParameterAnnotations.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ParameterAnnotations.java deleted file mode 100644 index d538f64b..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/ParameterAnnotations.java +++ /dev/null @@ -1,122 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -/** - * base class for parameter annotations - * - * @since 6.0 - */ -public abstract class ParameterAnnotations extends Attribute { - - /** Table of parameter annotations */ - private ParameterAnnotationEntry[] parameterAnnotationTable; - - /** - * @param parameter_annotation_type the subclass type of the parameter annotation - * @param name_index Index pointing to the name Code - * @param length Content length in bytes - * @param input Input stream - * @param constant_pool Array of constants - */ - ParameterAnnotations(final byte parameter_annotation_type, final int name_index, final int length, - final DataInput input, final ConstantPool constant_pool) throws IOException { - this(parameter_annotation_type, name_index, length, (ParameterAnnotationEntry[]) null, - constant_pool); - final int num_parameters = input.readUnsignedByte(); - parameterAnnotationTable = new ParameterAnnotationEntry[num_parameters]; - for (int i = 0; i < num_parameters; i++) { - parameterAnnotationTable[i] = new ParameterAnnotationEntry(input, constant_pool); - } - } - - - /** - * @param parameterAnnotationType the subclass type of the parameter annotation - * @param nameIndex Index pointing to the name Code - * @param length Content length in bytes - * @param parameterAnnotationTable the actual parameter annotations - * @param constantPool Array of constants - */ - public ParameterAnnotations(final byte parameterAnnotationType, final int nameIndex, final int length, - final ParameterAnnotationEntry[] parameterAnnotationTable, final ConstantPool constantPool) { - super(parameterAnnotationType, nameIndex, length, constantPool); - this.parameterAnnotationTable = parameterAnnotationTable; - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitely - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitParameterAnnotation(this); - } - - - /** - * @param parameterAnnotationTable the entries to set in this parameter annotation - */ - public final void setParameterAnnotationTable(final ParameterAnnotationEntry[] parameterAnnotationTable ) { - this.parameterAnnotationTable = parameterAnnotationTable; - } - - - /** - * @return the parameter annotation entry table - */ - public final ParameterAnnotationEntry[] getParameterAnnotationTable() { - return parameterAnnotationTable; - } - - - /** - * returns the array of parameter annotation entries in this parameter annotation - */ - public ParameterAnnotationEntry[] getParameterAnnotationEntries() { - return parameterAnnotationTable; - } - - @Override - public void dump(final DataOutputStream dos) throws IOException - { - super.dump(dos); - dos.writeByte(parameterAnnotationTable.length); - - for (final ParameterAnnotationEntry element : parameterAnnotationTable) { - element.dump(dos); - } - - } - - /** - * @return deep copy of this attribute - */ - @Override - public Attribute copy( final ConstantPool constant_pool ) { - return (Attribute) clone(); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/RuntimeInvisibleAnnotations.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/RuntimeInvisibleAnnotations.java deleted file mode 100644 index 7901db9e..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/RuntimeInvisibleAnnotations.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * represents an annotation that is represented in the class file but is not - * provided to the JVM. - * - * @since 6.0 - */ -public class RuntimeInvisibleAnnotations extends Annotations -{ - /** - * @param name_index - * Index pointing to the name Code - * @param length - * Content length in bytes - * @param input - * Input stream - * @param constant_pool - * Array of constants - */ - public RuntimeInvisibleAnnotations(final int name_index, final int length, final DataInput input, final ConstantPool constant_pool) - throws IOException - { - super(Const.ATTR_RUNTIME_INVISIBLE_ANNOTATIONS, name_index, length, input, constant_pool, false); - } - - /** - * @return deep copy of this attribute - */ - @Override - public Attribute copy(final ConstantPool constant_pool) - { - return (Attribute) clone(); - } - - @Override - public final void dump(final DataOutputStream dos) throws IOException - { - super.dump(dos); - writeAnnotations(dos); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/RuntimeInvisibleParameterAnnotations.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/RuntimeInvisibleParameterAnnotations.java deleted file mode 100644 index 078b3a5d..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/RuntimeInvisibleParameterAnnotations.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * Represents a parameter annotation that is represented in the class file - * but is not provided to the JVM. - * - * @since 6.0 - */ -public class RuntimeInvisibleParameterAnnotations extends ParameterAnnotations { - - /** - * @param name_index Index pointing to the name Code - * @param length Content length in bytes - * @param input Input stream - * @param constant_pool Array of constants - */ - public RuntimeInvisibleParameterAnnotations(final int name_index, final int length, final DataInput input, final ConstantPool constant_pool) - throws IOException { - super(Const.ATTR_RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS, name_index, length, input, constant_pool); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/RuntimeVisibleAnnotations.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/RuntimeVisibleAnnotations.java deleted file mode 100644 index 20f42f7f..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/RuntimeVisibleAnnotations.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * represents an annotation that is represented in the class file and is - * provided to the JVM. - * - * @since 6.0 - */ -public class RuntimeVisibleAnnotations extends Annotations -{ - /** - * @param name_index - * Index pointing to the name Code - * @param length - * Content length in bytes - * @param input - * Input stream - * @param constant_pool - * Array of constants - */ - public RuntimeVisibleAnnotations(final int name_index, final int length, final DataInput input, final ConstantPool constant_pool) throws IOException - { - super(Const.ATTR_RUNTIME_VISIBLE_ANNOTATIONS, name_index, length, input, constant_pool, true); - } - - /** - * @return deep copy of this attribute - */ - @Override - public Attribute copy(final ConstantPool constant_pool) - { - return (Attribute) clone(); - } - - @Override - public final void dump(final DataOutputStream dos) throws IOException - { - super.dump(dos); - writeAnnotations(dos); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/RuntimeVisibleParameterAnnotations.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/RuntimeVisibleParameterAnnotations.java deleted file mode 100644 index 4f27d5ca..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/RuntimeVisibleParameterAnnotations.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * Represents a parameter annotation that is represented in the class file - * and is provided to the JVM. - * - * @since 6.0 - */ -public class RuntimeVisibleParameterAnnotations extends ParameterAnnotations { - - /** - * @param name_index Index pointing to the name Code - * @param length Content length in bytes - * @param input Input stream - * @param constant_pool Array of constants - */ - public RuntimeVisibleParameterAnnotations(final int name_index, final int length, final DataInput input, final ConstantPool constant_pool) - throws IOException { - super(Const.ATTR_RUNTIME_VISIBLE_PARAMETER_ANNOTATIONS, name_index, length, input, constant_pool); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/Signature.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/Signature.java deleted file mode 100644 index 88cfdc58..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/Signature.java +++ /dev/null @@ -1,269 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.ByteArrayInputStream; -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * This class is derived from Attribute and represents a reference - * to a GJ attribute. - * - * @see Attribute - */ -public final class Signature extends Attribute { - - private int signatureIndex; - - - /** - * Initialize from another object. Note that both objects use the same - * references (shallow copy). Use clone() for a physical copy. - */ - public Signature(final Signature c) { - this(c.getNameIndex(), c.getLength(), c.getSignatureIndex(), c.getConstantPool()); - } - - - /** - * Construct object from file stream. - * @param name_index Index in constant pool to CONSTANT_Utf8 - * @param length Content length in bytes - * @param input Input stream - * @param constant_pool Array of constants - * @throws IOException - */ - Signature(final int name_index, final int length, final DataInput input, final ConstantPool constant_pool) - throws IOException { - this(name_index, length, input.readUnsignedShort(), constant_pool); - } - - - /** - * @param name_index Index in constant pool to CONSTANT_Utf8 - * @param length Content length in bytes - * @param signatureIndex Index in constant pool to CONSTANT_Utf8 - * @param constant_pool Array of constants - */ - public Signature(final int name_index, final int length, final int signatureIndex, final ConstantPool constant_pool) { - super(Const.ATTR_SIGNATURE, name_index, length, constant_pool); - this.signatureIndex = signatureIndex; - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitely - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - //System.err.println("Visiting non-standard Signature object"); - v.visitSignature(this); - } - - - /** - * Dump source file attribute to file stream in binary format. - * - * @param file Output file stream - * @throws IOException - */ - @Override - public void dump( final DataOutputStream file ) throws IOException { - super.dump(file); - file.writeShort(signatureIndex); - } - - - /** - * @return Index in constant pool of source file name. - */ - public int getSignatureIndex() { - return signatureIndex; - } - - - /** - * @param signatureIndex the index info the constant pool of this signature - */ - public void setSignatureIndex( final int signatureIndex ) { - this.signatureIndex = signatureIndex; - } - - - /** - * @return GJ signature. - */ - public String getSignature() { - final ConstantUtf8 c = (ConstantUtf8) super.getConstantPool().getConstant(signatureIndex, - Const.CONSTANT_Utf8); - return c.getBytes(); - } - - /** - * Extends ByteArrayInputStream to make 'unreading' chars possible. - */ - private static final class MyByteArrayInputStream extends ByteArrayInputStream { - - MyByteArrayInputStream(final String data) { - super(data.getBytes()); - } - - - String getData() { - return new String(buf); - } - - - void unread() { - if (pos > 0) { - pos--; - } - } - } - - - private static boolean identStart( final int ch ) { - return ch == 'T' || ch == 'L'; - } - - - private static void matchIdent( final MyByteArrayInputStream in, final StringBuilder buf ) { - int ch; - if ((ch = in.read()) == -1) { - throw new IllegalArgumentException("Illegal signature: " + in.getData() - + " no ident, reaching EOF"); - } - //System.out.println("return from ident:" + (char)ch); - if (!identStart(ch)) { - final StringBuilder buf2 = new StringBuilder(); - int count = 1; - while (Character.isJavaIdentifierPart((char) ch)) { - buf2.append((char) ch); - count++; - ch = in.read(); - } - if (ch == ':') { // Ok, formal parameter - in.skip("Ljava/lang/Object".length()); - buf.append(buf2); - ch = in.read(); - in.unread(); - //System.out.println("so far:" + buf2 + ":next:" +(char)ch); - } else { - for (int i = 0; i < count; i++) { - in.unread(); - } - } - return; - } - final StringBuilder buf2 = new StringBuilder(); - ch = in.read(); - do { - buf2.append((char) ch); - ch = in.read(); - //System.out.println("within ident:"+ (char)ch); - } while ((ch != -1) && (Character.isJavaIdentifierPart((char) ch) || (ch == '/'))); - buf.append(buf2.toString().replace('/', '.')); - //System.out.println("regular return ident:"+ (char)ch + ":" + buf2); - if (ch != -1) { - in.unread(); - } - } - - - private static void matchGJIdent( final MyByteArrayInputStream in, final StringBuilder buf ) { - int ch; - matchIdent(in, buf); - ch = in.read(); - if ((ch == '<') || ch == '(') { // Parameterized or method - //System.out.println("Enter <"); - buf.append((char) ch); - matchGJIdent(in, buf); - while (((ch = in.read()) != '>') && (ch != ')')) { // List of parameters - if (ch == -1) { - throw new IllegalArgumentException("Illegal signature: " + in.getData() - + " reaching EOF"); - } - //System.out.println("Still no >"); - buf.append(", "); - in.unread(); - matchGJIdent(in, buf); // Recursive call - } - //System.out.println("Exit >"); - buf.append((char) ch); - } else { - in.unread(); - } - ch = in.read(); - if (identStart(ch)) { - in.unread(); - matchGJIdent(in, buf); - } else if (ch == ')') { - in.unread(); - return; - } else if (ch != ';') { - throw new IllegalArgumentException("Illegal signature: " + in.getData() + " read " + (char) ch); - } - } - - - public static String translate( final String s ) { - //System.out.println("Sig:" + s); - final StringBuilder buf = new StringBuilder(); - matchGJIdent(new MyByteArrayInputStream(s), buf); - return buf.toString(); - } - - - // @since 6.0 is no longer final - public static boolean isFormalParameterList( final String s ) { - return s.startsWith("<") && (s.indexOf(':') > 0); - } - - - // @since 6.0 is no longer final - public static boolean isActualParameterList( final String s ) { - return s.startsWith("L") && s.endsWith(">;"); - } - - - /** - * @return String representation - */ - @Override - public String toString() { - final String s = getSignature(); - return "Signature: " + s; - } - - - /** - * @return deep copy of this attribute - */ - @Override - public Attribute copy( final ConstantPool _constant_pool ) { - return (Attribute) clone(); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/SimpleElementValue.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/SimpleElementValue.java deleted file mode 100644 index 9da22b6e..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/SimpleElementValue.java +++ /dev/null @@ -1,225 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * @since 6.0 - */ -public class SimpleElementValue extends ElementValue -{ - private int index; - - public SimpleElementValue(final int type, final int index, final ConstantPool cpool) - { - super(type, cpool); - this.index = index; - } - - /** - * @return Value entry index in the cpool - */ - public int getIndex() - { - return index; - } - - public void setIndex(final int index) - { - this.index = index; - } - - public String getValueString() - { - if (super.getType() != STRING) { - throw new IllegalStateException( - "Dont call getValueString() on a non STRING ElementValue"); - } - final ConstantUtf8 c = (ConstantUtf8) super.getConstantPool().getConstant(getIndex(), - Const.CONSTANT_Utf8); - return c.getBytes(); - } - - public int getValueInt() - { - if (super.getType() != PRIMITIVE_INT) { - throw new IllegalStateException( - "Dont call getValueString() on a non STRING ElementValue"); - } - final ConstantInteger c = (ConstantInteger) super.getConstantPool().getConstant(getIndex(), - Const.CONSTANT_Integer); - return c.getBytes(); - } - - public byte getValueByte() - { - if (super.getType() != PRIMITIVE_BYTE) { - throw new IllegalStateException( - "Dont call getValueByte() on a non BYTE ElementValue"); - } - final ConstantInteger c = (ConstantInteger) super.getConstantPool().getConstant(getIndex(), - Const.CONSTANT_Integer); - return (byte) c.getBytes(); - } - - public char getValueChar() - { - if (super.getType() != PRIMITIVE_CHAR) { - throw new IllegalStateException( - "Dont call getValueChar() on a non CHAR ElementValue"); - } - final ConstantInteger c = (ConstantInteger) super.getConstantPool().getConstant(getIndex(), - Const.CONSTANT_Integer); - return (char) c.getBytes(); - } - - public long getValueLong() - { - if (super.getType() != PRIMITIVE_LONG) { - throw new IllegalStateException( - "Dont call getValueLong() on a non LONG ElementValue"); - } - final ConstantLong j = (ConstantLong) super.getConstantPool().getConstant(getIndex()); - return j.getBytes(); - } - - public float getValueFloat() - { - if (super.getType() != PRIMITIVE_FLOAT) { - throw new IllegalStateException( - "Dont call getValueFloat() on a non FLOAT ElementValue"); - } - final ConstantFloat f = (ConstantFloat) super.getConstantPool().getConstant(getIndex()); - return f.getBytes(); - } - - public double getValueDouble() - { - if (super.getType() != PRIMITIVE_DOUBLE) { - throw new IllegalStateException( - "Dont call getValueDouble() on a non DOUBLE ElementValue"); - } - final ConstantDouble d = (ConstantDouble) super.getConstantPool().getConstant(getIndex()); - return d.getBytes(); - } - - public boolean getValueBoolean() - { - if (super.getType() != PRIMITIVE_BOOLEAN) { - throw new IllegalStateException( - "Dont call getValueBoolean() on a non BOOLEAN ElementValue"); - } - final ConstantInteger bo = (ConstantInteger) super.getConstantPool().getConstant(getIndex()); - return bo.getBytes() != 0; - } - - public short getValueShort() - { - if (super.getType() != PRIMITIVE_SHORT) { - throw new IllegalStateException( - "Dont call getValueShort() on a non SHORT ElementValue"); - } - final ConstantInteger s = (ConstantInteger) super.getConstantPool().getConstant(getIndex()); - return (short) s.getBytes(); - } - - @Override - public String toString() - { - return stringifyValue(); - } - - // Whatever kind of value it is, return it as a string - @Override - public String stringifyValue() - { - final ConstantPool cpool = super.getConstantPool(); - final int _type = super.getType(); - switch (_type) - { - case PRIMITIVE_INT: - final ConstantInteger c = (ConstantInteger) cpool.getConstant(getIndex(), - Const.CONSTANT_Integer); - return Integer.toString(c.getBytes()); - case PRIMITIVE_LONG: - final ConstantLong j = (ConstantLong) cpool.getConstant(getIndex(), - Const.CONSTANT_Long); - return Long.toString(j.getBytes()); - case PRIMITIVE_DOUBLE: - final ConstantDouble d = (ConstantDouble) cpool.getConstant(getIndex(), - Const.CONSTANT_Double); - return Double.toString(d.getBytes()); - case PRIMITIVE_FLOAT: - final ConstantFloat f = (ConstantFloat) cpool.getConstant(getIndex(), - Const.CONSTANT_Float); - return Float.toString(f.getBytes()); - case PRIMITIVE_SHORT: - final ConstantInteger s = (ConstantInteger) cpool.getConstant(getIndex(), - Const.CONSTANT_Integer); - return Integer.toString(s.getBytes()); - case PRIMITIVE_BYTE: - final ConstantInteger b = (ConstantInteger) cpool.getConstant(getIndex(), - Const.CONSTANT_Integer); - return Integer.toString(b.getBytes()); - case PRIMITIVE_CHAR: - final ConstantInteger ch = (ConstantInteger) cpool.getConstant( - getIndex(), Const.CONSTANT_Integer); - return String.valueOf((char)ch.getBytes()); - case PRIMITIVE_BOOLEAN: - final ConstantInteger bo = (ConstantInteger) cpool.getConstant( - getIndex(), Const.CONSTANT_Integer); - if (bo.getBytes() == 0) { - return "false"; - } - return "true"; - case STRING: - final ConstantUtf8 cu8 = (ConstantUtf8) cpool.getConstant(getIndex(), - Const.CONSTANT_Utf8); - return cu8.getBytes(); - default: - throw new IllegalStateException("SimpleElementValue class does not know how to stringify type " + _type); - } - } - - @Override - public void dump(final DataOutputStream dos) throws IOException - { - final int _type = super.getType(); - dos.writeByte(_type); // u1 kind of value - switch (_type) - { - case PRIMITIVE_INT: - case PRIMITIVE_BYTE: - case PRIMITIVE_CHAR: - case PRIMITIVE_FLOAT: - case PRIMITIVE_LONG: - case PRIMITIVE_BOOLEAN: - case PRIMITIVE_SHORT: - case PRIMITIVE_DOUBLE: - case STRING: - dos.writeShort(getIndex()); - break; - default: - throw new IllegalStateException("SimpleElementValue doesnt know how to write out type " + _type); - } - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/SourceFile.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/SourceFile.java deleted file mode 100644 index e0889475..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/SourceFile.java +++ /dev/null @@ -1,149 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * This class is derived from Attribute and represents a reference - * to the source file of this class. At most one SourceFile attribute - * should appear per classfile. The intention of this class is that it is - * instantiated from the Attribute.readAttribute() method. - * - * @see Attribute - */ -public final class SourceFile extends Attribute { - - private int sourceFileIndex; - - - /** - * Initialize from another object. Note that both objects use the same - * references (shallow copy). Use clone() for a physical copy. - */ - public SourceFile(final SourceFile c) { - this(c.getNameIndex(), c.getLength(), c.getSourceFileIndex(), c.getConstantPool()); - } - - - /** - * Construct object from input stream. - * @param name_index Index in constant pool to CONSTANT_Utf8 - * @param length Content length in bytes - * @param input Input stream - * @param constant_pool Array of constants - * @throws IOException - */ - SourceFile(final int name_index, final int length, final DataInput input, final ConstantPool constant_pool) - throws IOException { - this(name_index, length, input.readUnsignedShort(), constant_pool); - } - - - /** - * @param name_index Index in constant pool to CONSTANT_Utf8, which - * should represent the string "SourceFile". - * @param length Content length in bytes, the value should be 2. - * @param constantPool The constant pool that this attribute is - * associated with. - * @param sourceFileIndex Index in constant pool to CONSTANT_Utf8. This - * string will be interpreted as the name of the file from which this - * class was compiled. It will not be interpreted as indicating the name - * of the directory contqining the file or an absolute path; this - * information has to be supplied the consumer of this attribute - in - * many cases, the JVM. - */ - public SourceFile(final int name_index, final int length, final int sourceFileIndex, final ConstantPool constantPool) { - super(Const.ATTR_SOURCE_FILE, name_index, length, constantPool); - this.sourceFileIndex = sourceFileIndex; - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitely - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitSourceFile(this); - } - - - /** - * Dump source file attribute to file stream in binary format. - * - * @param file Output file stream - * @throws IOException - */ - @Override - public void dump( final DataOutputStream file ) throws IOException { - super.dump(file); - file.writeShort(sourceFileIndex); - } - - - /** - * @return Index in constant pool of source file name. - */ - public int getSourceFileIndex() { - return sourceFileIndex; - } - - - /** - * @param sourceFileIndex - */ - public void setSourceFileIndex( final int sourceFileIndex ) { - this.sourceFileIndex = sourceFileIndex; - } - - - /** - * @return Source file name. - */ - public String getSourceFileName() { - final ConstantUtf8 c = (ConstantUtf8) super.getConstantPool().getConstant(sourceFileIndex, - Const.CONSTANT_Utf8); - return c.getBytes(); - } - - - /** - * @return String representation - */ - @Override - public String toString() { - return "SourceFile: " + getSourceFileName(); - } - - - /** - * @return deep copy of this attribute - */ - @Override - public Attribute copy( final ConstantPool _constant_pool ) { - return (Attribute) clone(); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/StackMap.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/StackMap.java deleted file mode 100644 index 99ec3b2a..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/StackMap.java +++ /dev/null @@ -1,160 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * This class represents a stack map attribute used for - * preverification of Java classes for the Java 2 Micro Edition - * (J2ME). This attribute is used by the KVM and contained - * within the Code attribute of a method. See CLDC specification - * �5.3.1.2 - * - * @see Code - * @see StackMapEntry - * @see StackMapType - */ -public final class StackMap extends Attribute { - - private StackMapEntry[] map; // Table of stack map entries - - - /* - * @param name_index Index of name - * @param length Content length in bytes - * @param map Table of stack map entries - * @param constant_pool Array of constants - */ - public StackMap(final int name_index, final int length, final StackMapEntry[] map, final ConstantPool constant_pool) { - super(Const.ATTR_STACK_MAP, name_index, length, constant_pool); - this.map = map; - } - - - /** - * Construct object from input stream. - * - * @param name_index Index of name - * @param length Content length in bytes - * @param input Input stream - * @param constant_pool Array of constants - * @throws IOException - */ - StackMap(final int name_index, final int length, final DataInput input, final ConstantPool constant_pool) throws IOException { - this(name_index, length, (StackMapEntry[]) null, constant_pool); - final int map_length = input.readUnsignedShort(); - map = new StackMapEntry[map_length]; - for (int i = 0; i < map_length; i++) { - map[i] = new StackMapEntry(input, constant_pool); - } - } - - - /** - * Dump stack map table attribute to file stream in binary format. - * - * @param file Output file stream - * @throws IOException - */ - @Override - public void dump( final DataOutputStream file ) throws IOException { - super.dump(file); - file.writeShort(map.length); - for (final StackMapEntry entry : map) { - entry.dump(file); - } - } - - - /** - * @return Array of stack map entries - */ - public StackMapEntry[] getStackMap() { - return map; - } - - - /** - * @param map Array of stack map entries - */ - public void setStackMap( final StackMapEntry[] map ) { - this.map = map; - int len = 2; // Length of 'number_of_entries' field prior to the array of stack maps - for (final StackMapEntry element : map) { - len += element.getMapEntrySize(); - } - setLength(len); - } - - - /** - * @return String representation. - */ - @Override - public String toString() { - final StringBuilder buf = new StringBuilder("StackMap("); - for (int i = 0; i < map.length; i++) { - buf.append(map[i]); - if (i < map.length - 1) { - buf.append(", "); - } - } - buf.append(')'); - return buf.toString(); - } - - - /** - * @return deep copy of this attribute - */ - @Override - public Attribute copy( final ConstantPool _constant_pool ) { - final StackMap c = (StackMap) clone(); - c.map = new StackMapEntry[map.length]; - for (int i = 0; i < map.length; i++) { - c.map[i] = map[i].copy(); - } - c.setConstantPool(_constant_pool); - return c; - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitely - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackMap(this); - } - - - public int getMapLength() { - return map == null ? 0 : map.length; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/StackMapEntry.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/StackMapEntry.java deleted file mode 100644 index ef23b713..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/StackMapEntry.java +++ /dev/null @@ -1,435 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; -import org.apache.bcel.Const; - -/** - * This class represents a stack map entry recording the types of - * local variables and the the of stack items at a given byte code offset. - * See CLDC specification 5.3.1.2 - * - * @see StackMap - * @see StackMapType - */ -public final class StackMapEntry implements Node, Cloneable -{ - - private int frameType; - private int byteCodeOffset; - private StackMapType[] typesOfLocals; - private StackMapType[] typesOfStackItems; - private ConstantPool constantPool; - - - /** - * Construct object from input stream. - * - * @param input Input stream - * @throws IOException - */ - StackMapEntry(final DataInput input, final ConstantPool constantPool) throws IOException { - this(input.readByte() & 0xFF, -1, null, null, constantPool); - - if (frameType >= Const.SAME_FRAME && frameType <= Const.SAME_FRAME_MAX) { - byteCodeOffset = frameType - Const.SAME_FRAME; - } else if (frameType >= Const.SAME_LOCALS_1_STACK_ITEM_FRAME && - frameType <= Const.SAME_LOCALS_1_STACK_ITEM_FRAME_MAX) { - byteCodeOffset = frameType - Const.SAME_LOCALS_1_STACK_ITEM_FRAME; - typesOfStackItems = new StackMapType[1]; - typesOfStackItems[0] = new StackMapType(input, constantPool); - } else if (frameType == Const.SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED) { - byteCodeOffset = input.readShort(); - typesOfStackItems = new StackMapType[1]; - typesOfStackItems[0] = new StackMapType(input, constantPool); - } else if (frameType >= Const.CHOP_FRAME && frameType <= Const.CHOP_FRAME_MAX) { - byteCodeOffset = input.readShort(); - } else if (frameType == Const.SAME_FRAME_EXTENDED) { - byteCodeOffset = input.readShort(); - } else if (frameType >= Const.APPEND_FRAME && frameType <= Const.APPEND_FRAME_MAX) { - byteCodeOffset = input.readShort(); - final int number_of_locals = frameType - 251; - typesOfLocals = new StackMapType[number_of_locals]; - for (int i = 0; i < number_of_locals; i++) { - typesOfLocals[i] = new StackMapType(input, constantPool); - } - } else if (frameType == Const.FULL_FRAME) { - byteCodeOffset = input.readShort(); - final int number_of_locals = input.readShort(); - typesOfLocals = new StackMapType[number_of_locals]; - for (int i = 0; i < number_of_locals; i++) { - typesOfLocals[i] = new StackMapType(input, constantPool); - } - final int number_of_stack_items = input.readShort(); - typesOfStackItems = new StackMapType[number_of_stack_items]; - for (int i = 0; i < number_of_stack_items; i++) { - typesOfStackItems[i] = new StackMapType(input, constantPool); - } - } else { - /* Can't happen */ - throw new ClassFormatException ("Invalid frame type found while parsing stack map table: " + frameType); - } - } - - /** - * DO NOT USE - * - * @param byteCodeOffset - * @param numberOfLocals NOT USED - * @param typesOfLocals array of {@link StackMapType}s of locals - * @param numberOfStackItems NOT USED - * @param typesOfStackItems array ot {@link StackMapType}s of stack items - * @param constantPool the constant pool - * @deprecated Since 6.0, use {@link #StackMapEntry(int, int, StackMapType[], StackMapType[], ConstantPool)} - * instead - */ - @java.lang.Deprecated - public StackMapEntry(final int byteCodeOffset, final int numberOfLocals, - final StackMapType[] typesOfLocals, final int numberOfStackItems, - final StackMapType[] typesOfStackItems, final ConstantPool constantPool) { - this.byteCodeOffset = byteCodeOffset; - this.typesOfLocals = typesOfLocals != null ? typesOfLocals : new StackMapType[0]; - this.typesOfStackItems = typesOfStackItems != null ? typesOfStackItems : new StackMapType[0]; - this.constantPool = constantPool; - } - - /** - * Create an instance - * - * @param tag the frameType to use - * @param byteCodeOffset - * @param typesOfLocals array of {@link StackMapType}s of locals - * @param typesOfStackItems array ot {@link StackMapType}s of stack items - * @param constantPool the constant pool - */ - public StackMapEntry(final int tag, final int byteCodeOffset, - final StackMapType[] typesOfLocals, - final StackMapType[] typesOfStackItems, final ConstantPool constantPool) { - this.frameType = tag; - this.byteCodeOffset = byteCodeOffset; - this.typesOfLocals = typesOfLocals != null ? typesOfLocals : new StackMapType[0]; - this.typesOfStackItems = typesOfStackItems != null ? typesOfStackItems : new StackMapType[0]; - this.constantPool = constantPool; - } - - - /** - * Dump stack map entry - * - * @param file Output file stream - * @throws IOException - */ - public void dump( final DataOutputStream file ) throws IOException { - file.write(frameType); - if (frameType >= Const.SAME_FRAME && frameType <= Const.SAME_FRAME_MAX) { - // nothing to be done - } else if (frameType >= Const.SAME_LOCALS_1_STACK_ITEM_FRAME && - frameType <= Const.SAME_LOCALS_1_STACK_ITEM_FRAME_MAX) { - typesOfStackItems[0].dump(file); - } else if (frameType == Const.SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED) { - file.writeShort(byteCodeOffset); - typesOfStackItems[0].dump(file); - } else if (frameType >= Const.CHOP_FRAME && frameType <= Const.CHOP_FRAME_MAX) { - file.writeShort(byteCodeOffset); - } else if (frameType == Const.SAME_FRAME_EXTENDED) { - file.writeShort(byteCodeOffset); - } else if (frameType >= Const.APPEND_FRAME && frameType <= Const.APPEND_FRAME_MAX) { - file.writeShort(byteCodeOffset); - for (final StackMapType type : typesOfLocals) { - type.dump(file); - } - } else if (frameType == Const.FULL_FRAME) { - file.writeShort(byteCodeOffset); - file.writeShort(typesOfLocals.length); - for (final StackMapType type : typesOfLocals) { - type.dump(file); - } - file.writeShort(typesOfStackItems.length); - for (final StackMapType type : typesOfStackItems) { - type.dump(file); - } - } else { - /* Can't happen */ - throw new ClassFormatException ("Invalid Stack map table tag: " + frameType); - } - } - - - /** - * @return String representation. - */ - @Override - public String toString() { - final StringBuilder buf = new StringBuilder(64); - buf.append("("); - if (frameType >= Const.SAME_FRAME && frameType <= Const.SAME_FRAME_MAX) { - buf.append("SAME"); - } else if (frameType >= Const.SAME_LOCALS_1_STACK_ITEM_FRAME && - frameType <= Const.SAME_LOCALS_1_STACK_ITEM_FRAME_MAX) { - buf.append("SAME_LOCALS_1_STACK"); - } else if (frameType == Const.SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED) { - buf.append("SAME_LOCALS_1_STACK_EXTENDED"); - } else if (frameType >= Const.CHOP_FRAME && frameType <= Const.CHOP_FRAME_MAX) { - buf.append("CHOP ").append(String.valueOf(251-frameType)); - } else if (frameType == Const.SAME_FRAME_EXTENDED) { - buf.append("SAME_EXTENDED"); - } else if (frameType >= Const.APPEND_FRAME && frameType <= Const.APPEND_FRAME_MAX) { - buf.append("APPEND ").append(String.valueOf(frameType-251)); - } else if (frameType == Const.FULL_FRAME) { - buf.append("FULL"); - } else { - buf.append("UNKNOWN (").append(frameType).append(")"); - } - buf.append(", offset delta=").append(byteCodeOffset); - if (typesOfLocals.length > 0) { - buf.append(", locals={"); - for (int i = 0; i < typesOfLocals.length; i++) { - buf.append(typesOfLocals[i]); - if (i < typesOfLocals.length - 1) { - buf.append(", "); - } - } - buf.append("}"); - } - if (typesOfStackItems.length > 0) { - buf.append(", stack items={"); - for (int i = 0; i < typesOfStackItems.length; i++) { - buf.append(typesOfStackItems[i]); - if (i < typesOfStackItems.length - 1) { - buf.append(", "); - } - } - buf.append("}"); - } - buf.append(")"); - return buf.toString(); - } - - - /** - * Calculate stack map entry size - * - */ - int getMapEntrySize() { - if (frameType >= Const.SAME_FRAME && frameType <= Const.SAME_FRAME_MAX) { - return 1; - } else if (frameType >= Const.SAME_LOCALS_1_STACK_ITEM_FRAME && - frameType <= Const.SAME_LOCALS_1_STACK_ITEM_FRAME_MAX) { - return 1 + (typesOfStackItems[0].hasIndex() ? 3 : 1); - } else if (frameType == Const.SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED) { - return 3 + (typesOfStackItems[0].hasIndex() ? 3 : 1); - } else if (frameType >= Const.CHOP_FRAME && frameType <= Const.CHOP_FRAME_MAX) { - return 3; - } else if (frameType == Const.SAME_FRAME_EXTENDED) { - return 3; - } else if (frameType >= Const.APPEND_FRAME && frameType <= Const.APPEND_FRAME_MAX) { - int len = 3; - for (final StackMapType types_of_local : typesOfLocals) { - len += types_of_local.hasIndex() ? 3 : 1; - } - return len; - } else if (frameType == Const.FULL_FRAME) { - int len = 7; - for (final StackMapType types_of_local : typesOfLocals) { - len += types_of_local.hasIndex() ? 3 : 1; - } - for (final StackMapType types_of_stack_item : typesOfStackItems) { - len += types_of_stack_item.hasIndex() ? 3 : 1; - } - return len; - } else { - throw new IllegalStateException("Invalid StackMap frameType: " + frameType); - } - } - - - public void setFrameType( final int f ) { - if (f >= Const.SAME_FRAME && f <= Const.SAME_FRAME_MAX) { - byteCodeOffset = f - Const.SAME_FRAME; - } else if (f >= Const.SAME_LOCALS_1_STACK_ITEM_FRAME && - f <= Const.SAME_LOCALS_1_STACK_ITEM_FRAME_MAX) { - byteCodeOffset = f - Const.SAME_LOCALS_1_STACK_ITEM_FRAME; - } else if (f == Const.SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED) { // CHECKSTYLE IGNORE EmptyBlock - } else if (f >= Const.CHOP_FRAME && f <= Const.CHOP_FRAME_MAX) { // CHECKSTYLE IGNORE EmptyBlock - } else if (f == Const.SAME_FRAME_EXTENDED) { // CHECKSTYLE IGNORE EmptyBlock - } else if (f >= Const.APPEND_FRAME && f <= Const.APPEND_FRAME_MAX) { // CHECKSTYLE IGNORE EmptyBlock - } else if (f == Const.FULL_FRAME) { // CHECKSTYLE IGNORE EmptyBlock - } else { - throw new IllegalArgumentException("Invalid StackMap frameType"); - } - frameType = f; - } - - - public int getFrameType() { - return frameType; - } - - - public void setByteCodeOffset( final int new_offset ) { - if (new_offset < 0 || new_offset > 32767) { - throw new IllegalArgumentException("Invalid StackMap offset: " + new_offset); - } - - if (frameType >= Const.SAME_FRAME && - frameType <= Const.SAME_FRAME_MAX) { - if (new_offset > Const.SAME_FRAME_MAX) { - frameType = Const.SAME_FRAME_EXTENDED; - } else { - frameType = new_offset; - } - } else if (frameType >= Const.SAME_LOCALS_1_STACK_ITEM_FRAME && - frameType <= Const.SAME_LOCALS_1_STACK_ITEM_FRAME_MAX) { - if (new_offset > Const.SAME_FRAME_MAX) { - frameType = Const.SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED; - } else { - frameType = Const.SAME_LOCALS_1_STACK_ITEM_FRAME + new_offset; - } - } else if (frameType == Const.SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED) { // CHECKSTYLE IGNORE EmptyBlock - } else if (frameType >= Const.CHOP_FRAME && - frameType <= Const.CHOP_FRAME_MAX) { // CHECKSTYLE IGNORE EmptyBlock - } else if (frameType == Const.SAME_FRAME_EXTENDED) { // CHECKSTYLE IGNORE EmptyBlock - } else if (frameType >= Const.APPEND_FRAME && - frameType <= Const.APPEND_FRAME_MAX) { // CHECKSTYLE IGNORE EmptyBlock - } else if (frameType == Const.FULL_FRAME) { // CHECKSTYLE IGNORE EmptyBlock - } else { - throw new IllegalStateException("Invalid StackMap frameType: " + frameType); - } - byteCodeOffset = new_offset; - } - - - /** - * Update the distance (as an offset delta) from this StackMap - * entry to the next. Note that this might cause the the - * frame type to change. Note also that delta may be negative. - * - * @param delta offset delta - */ - public void updateByteCodeOffset(final int delta) { - setByteCodeOffset(byteCodeOffset + delta); - } - - - public int getByteCodeOffset() { - return byteCodeOffset; - } - - - /** - * - * @deprecated since 6.0 - */ - @java.lang.Deprecated - public void setNumberOfLocals( final int n ) { // TODO unused - } - - - public int getNumberOfLocals() { - return typesOfLocals.length; - } - - - public void setTypesOfLocals( final StackMapType[] types ) { - typesOfLocals = types != null ? types : new StackMapType[0]; - } - - - public StackMapType[] getTypesOfLocals() { - return typesOfLocals; - } - - - /** - * - * @deprecated since 6.0 - */ - @java.lang.Deprecated - public void setNumberOfStackItems( final int n ) { // TODO unused - } - - - public int getNumberOfStackItems() { - return typesOfStackItems.length; - } - - - public void setTypesOfStackItems( final StackMapType[] types ) { - typesOfStackItems = types != null ? types : new StackMapType[0]; - } - - - public StackMapType[] getTypesOfStackItems() { - return typesOfStackItems; - } - - - /** - * @return deep copy of this object - */ - public StackMapEntry copy() { - StackMapEntry e; - try { - e = (StackMapEntry) clone(); - } catch (final CloneNotSupportedException ex) { - throw new Error("Clone Not Supported"); - } - - e.typesOfLocals = new StackMapType[typesOfLocals.length]; - for (int i = 0; i < typesOfLocals.length; i++) { - e.typesOfLocals[i] = typesOfLocals[i].copy(); - } - e.typesOfStackItems = new StackMapType[typesOfStackItems.length]; - for (int i = 0; i < typesOfStackItems.length; i++) { - e.typesOfStackItems[i] = typesOfStackItems[i].copy(); - } - return e; - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitely - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackMapEntry(this); - } - - - /** - * @return Constant pool used by this object. - */ - public ConstantPool getConstantPool() { - return constantPool; - } - - - /** - * @param constantPool Constant pool to be used for this object. - */ - public void setConstantPool( final ConstantPool constantPool ) { - this.constantPool = constantPool; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/StackMapType.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/StackMapType.java deleted file mode 100644 index 4010642e..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/StackMapType.java +++ /dev/null @@ -1,166 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * This class represents the type of a local variable or item on stack - * used in the StackMap entries. - * - * @see StackMapEntry - * @see StackMap - * @see Const - */ -public final class StackMapType implements Cloneable { - - private byte type; - private int index = -1; // Index to CONSTANT_Class or offset - private ConstantPool constantPool; - - - /** - * Construct object from file stream. - * @param file Input stream - * @throws IOException - */ - StackMapType(final DataInput file, final ConstantPool constant_pool) throws IOException { - this(file.readByte(), -1, constant_pool); - if (hasIndex()) { - this.index = file.readShort(); - } - this.constantPool = constant_pool; - } - - - /** - * @param type type tag as defined in the Constants interface - * @param index index to constant pool, or byte code offset - */ - public StackMapType(final byte type, final int index, final ConstantPool constant_pool) { - if ((type < Const.ITEM_Bogus) || (type > Const.ITEM_NewObject)) { - throw new IllegalArgumentException("Illegal type for StackMapType: " + type); - } - this.type = type; - this.index = index; - this.constantPool = constant_pool; - } - - - public void setType( final byte t ) { - if ((t < Const.ITEM_Bogus) || (t > Const.ITEM_NewObject)) { - throw new IllegalArgumentException("Illegal type for StackMapType: " + t); - } - type = t; - } - - - public byte getType() { - return type; - } - - - public void setIndex( final int t ) { - index = t; - } - - - /** @return index to constant pool if type == ITEM_Object, or offset - * in byte code, if type == ITEM_NewObject, and -1 otherwise - */ - public int getIndex() { - return index; - } - - - /** - * Dump type entries to file. - * - * @param file Output file stream - * @throws IOException - */ - public void dump( final DataOutputStream file ) throws IOException { - file.writeByte(type); - if (hasIndex()) { - file.writeShort(getIndex()); - } - } - - - /** @return true, if type is either ITEM_Object or ITEM_NewObject - */ - public boolean hasIndex() { - return type == Const.ITEM_Object || type == Const.ITEM_NewObject; - } - - - private String printIndex() { - if (type == Const.ITEM_Object) { - if (index < 0) { - return ", class="; - } - return ", class=" + constantPool.constantToString(index, Const.CONSTANT_Class); - } else if (type == Const.ITEM_NewObject) { - return ", offset=" + index; - } else { - return ""; - } - } - - - /** - * @return String representation - */ - @Override - public String toString() { - return "(type=" + Const.getItemName(type) + printIndex() + ")"; - } - - - /** - * @return deep copy of this object - */ - public StackMapType copy() { - try { - return (StackMapType) clone(); - } catch (final CloneNotSupportedException e) { - // TODO should this throw? - } - return null; - } - - - /** - * @return Constant pool used by this object. - */ - public ConstantPool getConstantPool() { - return constantPool; - } - - - /** - * @param constantPool Constant pool to be used for this object. - */ - public void setConstantPool( final ConstantPool constantPool ) { - this.constantPool = constantPool; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/Synthetic.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/Synthetic.java deleted file mode 100644 index af24ecdc..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/Synthetic.java +++ /dev/null @@ -1,155 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; - -/** - * This class is derived from Attribute and declares this class as - * `synthetic', i.e., it needs special handling. The JVM specification - * states "A class member that does not appear in the source code must be - * marked using a Synthetic attribute." It may appear in the ClassFile - * attribute table, a field_info table or a method_info table. This class - * is intended to be instantiated from the - * Attribute.readAttribute() method. - * - * @see Attribute - */ -public final class Synthetic extends Attribute { - - private byte[] bytes; - - - /** - * Initialize from another object. Note that both objects use the same - * references (shallow copy). Use copy() for a physical copy. - */ - public Synthetic(final Synthetic c) { - this(c.getNameIndex(), c.getLength(), c.getBytes(), c.getConstantPool()); - } - - - /** - * @param name_index Index in constant pool to CONSTANT_Utf8, which - * should represent the string "Synthetic". - * @param length Content length in bytes - should be zero. - * @param bytes Attribute contents - * @param constant_pool The constant pool this attribute is associated - * with. - */ - public Synthetic(final int name_index, final int length, final byte[] bytes, final ConstantPool constant_pool) { - super(Const.ATTR_SYNTHETIC, name_index, length, constant_pool); - this.bytes = bytes; - } - - - /** - * Construct object from input stream. - * - * @param name_index Index in constant pool to CONSTANT_Utf8 - * @param length Content length in bytes - * @param input Input stream - * @param constant_pool Array of constants - * @throws IOException - */ - Synthetic(final int name_index, final int length, final DataInput input, final ConstantPool constant_pool) - throws IOException { - this(name_index, length, (byte[]) null, constant_pool); - if (length > 0) { - bytes = new byte[length]; - input.readFully(bytes); - println("Synthetic attribute with length > 0"); - } - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitely - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitSynthetic(this); - } - - - /** - * Dump source file attribute to file stream in binary format. - * - * @param file Output file stream - * @throws IOException - */ - @Override - public void dump( final DataOutputStream file ) throws IOException { - super.dump(file); - if (super.getLength() > 0) { - file.write(bytes, 0, super.getLength()); - } - } - - - /** - * @return data bytes. - */ - public byte[] getBytes() { - return bytes; - } - - - /** - * @param bytes - */ - public void setBytes( final byte[] bytes ) { - this.bytes = bytes; - } - - - /** - * @return String representation. - */ - @Override - public String toString() { - final StringBuilder buf = new StringBuilder("Synthetic"); - if (super.getLength() > 0) { - buf.append(" ").append(Utility.toHexString(bytes)); - } - return buf.toString(); - } - - - /** - * @return deep copy of this attribute - */ - @Override - public Attribute copy( final ConstantPool _constant_pool ) { - final Synthetic c = (Synthetic) clone(); - if (bytes != null) { - c.bytes = new byte[bytes.length]; - System.arraycopy(bytes, 0, c.bytes, 0, bytes.length); - } - c.setConstantPool(_constant_pool); - return c; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/Unknown.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/Unknown.java deleted file mode 100644 index 9aad0778..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/Unknown.java +++ /dev/null @@ -1,188 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; - -import org.apache.bcel.Const; - -/** - * This class represents a reference to an unknown (i.e., - * application-specific) attribute of a class. It is instantiated from the - * {@link Attribute#readAttribute(java.io.DataInput, ConstantPool)} method. - * Applications that need to read in application-specific attributes should create an - * {@link UnknownAttributeReader} implementation and attach it via - * {@link Attribute#addAttributeReader(String, UnknownAttributeReader)}. - - * - * @see Attribute - * @see UnknownAttributeReader - */ -public final class Unknown extends Attribute { - - private byte[] bytes; - private final String name; - private static final Map unknownAttributes = new HashMap<>(); - - - /** @return array of unknown attributes, but just one for each kind. - */ - static Unknown[] getUnknownAttributes() { - final Unknown[] unknowns = new Unknown[unknownAttributes.size()]; - unknownAttributes.values().toArray(unknowns); - unknownAttributes.clear(); - return unknowns; - } - - - /** - * Initialize from another object. Note that both objects use the same - * references (shallow copy). Use clone() for a physical copy. - */ - public Unknown(final Unknown c) { - this(c.getNameIndex(), c.getLength(), c.getBytes(), c.getConstantPool()); - } - - - /** - * Create a non-standard attribute. - * - * @param name_index Index in constant pool - * @param length Content length in bytes - * @param bytes Attribute contents - * @param constant_pool Array of constants - */ - public Unknown(final int name_index, final int length, final byte[] bytes, final ConstantPool constant_pool) { - super(Const.ATTR_UNKNOWN, name_index, length, constant_pool); - this.bytes = bytes; - name = ((ConstantUtf8) constant_pool.getConstant(name_index, Const.CONSTANT_Utf8)) - .getBytes(); - unknownAttributes.put(name, this); - } - - - /** - * Construct object from input stream. - * - * @param name_index Index in constant pool - * @param length Content length in bytes - * @param input Input stream - * @param constant_pool Array of constants - * @throws IOException - */ - Unknown(final int name_index, final int length, final DataInput input, final ConstantPool constant_pool) - throws IOException { - this(name_index, length, (byte[]) null, constant_pool); - if (length > 0) { - bytes = new byte[length]; - input.readFully(bytes); - } - } - - - /** - * Called by objects that are traversing the nodes of the tree implicitely - * defined by the contents of a Java class. I.e., the hierarchy of methods, - * fields, attributes, etc. spawns a tree of objects. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitUnknown(this); - } - - - /** - * Dump unknown bytes to file stream. - * - * @param file Output file stream - * @throws IOException - */ - @Override - public void dump( final DataOutputStream file ) throws IOException { - super.dump(file); - if (super.getLength() > 0) { - file.write(bytes, 0, super.getLength()); - } - } - - - /** - * @return data bytes. - */ - public byte[] getBytes() { - return bytes; - } - - - /** - * @return name of attribute. - */ - @Override - public String getName() { - return name; - } - - - /** - * @param bytes the bytes to set - */ - public void setBytes( final byte[] bytes ) { - this.bytes = bytes; - } - - - /** - * @return String representation. - */ - @Override - public String toString() { - if (super.getLength() == 0 || bytes == null) { - return "(Unknown attribute " + name + ")"; - } - String hex; - if (super.getLength() > 10) { - final byte[] tmp = new byte[10]; - System.arraycopy(bytes, 0, tmp, 0, 10); - hex = Utility.toHexString(tmp) + "... (truncated)"; - } else { - hex = Utility.toHexString(bytes); - } - return "(Unknown attribute " + name + ": " + hex + ")"; - } - - - /** - * @return deep copy of this attribute - */ - @Override - public Attribute copy( final ConstantPool _constant_pool ) { - final Unknown c = (Unknown) clone(); - if (bytes != null) { - c.bytes = new byte[bytes.length]; - System.arraycopy(bytes, 0, c.bytes, 0, bytes.length); - } - c.setConstantPool(_constant_pool); - return c; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/UnknownAttributeReader.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/UnknownAttributeReader.java deleted file mode 100644 index 097ecc83..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/UnknownAttributeReader.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.bcel.classfile; - -/** - * Unknown (non-standard) attributes may be read via user-defined factory - * objects that can be registered with the Attribute.addAttributeReader - * method. These factory objects should implement this interface. - * - * @see Attribute - * @since 6.0 - */ -public interface UnknownAttributeReader { - - /** - * When this attribute reader is added via the static method Attribute.addAttributeReader, - * an attribute name is associated with it. As the class file parser parses attributes, - * it will call various AttributeReaders based on the name of the attributes it is constructing. - * - * @param name_index An index into the constant pool, indexing a ConstantUtf8 - * that represents the name of the attribute. - * @param length The length of the data contained in the attribute. This is written - * into the constant pool and should agree with what the factory expects the length to be. - * @param file This is the data input that the factory needs to read its data from. - * @param constant_pool This is the constant pool associated with the Attribute that we are constructing. - * - * @return The user-defined AttributeReader should take this data and use - * it to construct an attribute. In the case of errors, a null can be - * returned which will cause the parsing of the class file to fail. - * - * @see Attribute#addAttributeReader(String, UnknownAttributeReader) - */ - Attribute createAttribute( int name_index, int length, java.io.DataInput file, ConstantPool constant_pool ); -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/Utility.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/Utility.java deleted file mode 100644 index 93c9977b..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/Utility.java +++ /dev/null @@ -1,1655 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.bcel.classfile; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.CharArrayReader; -import java.io.CharArrayWriter; -import java.io.FilterReader; -import java.io.FilterWriter; -import java.io.IOException; -import java.io.PrintStream; -import java.io.PrintWriter; -import java.io.Reader; -import java.io.Writer; -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; -import java.util.zip.GZIPInputStream; -import java.util.zip.GZIPOutputStream; - -import org.apache.bcel.Const; -import org.apache.bcel.util.ByteSequence; - -/** - * Utility functions that do not really belong to any class in particular. - * - */ -// @since 6.0 methods are no longer final -public abstract class Utility { - - private static int unwrap( final ThreadLocal tl ) { - return tl.get().intValue(); - } - - private static void wrap( final ThreadLocal tl, final int value ) { - tl.set(Integer.valueOf(value)); - } - - /* How many chars have been consumed - * during parsing in typeSignatureToString(). - * Read by methodSignatureToString(). - * Set by side effect, but only internally. - */ - private static ThreadLocal consumed_chars = new ThreadLocal() { - @Override - protected Integer initialValue() { - return Integer.valueOf(0); - } - }; - - /* The `WIDE' instruction is used in the - * byte code to allow 16-bit wide indices - * for local variables. This opcode - * precedes an `ILOAD', e.g.. The opcode - * immediately following takes an extra - * byte which is combined with the - * following byte to form a - * 16-bit value. - */ - private static boolean wide = false; - - - /** - * Convert bit field of flags into string such as `static final'. - * - * @param access_flags Access flags - * @return String representation of flags - */ - public static String accessToString( final int access_flags ) { - return accessToString(access_flags, false); - } - - - /** - * Convert bit field of flags into string such as `static final'. - * - * Special case: Classes compiled with new compilers and with the - * `ACC_SUPER' flag would be said to be "synchronized". This is - * because SUN used the same value for the flags `ACC_SUPER' and - * `ACC_SYNCHRONIZED'. - * - * @param access_flags Access flags - * @param for_class access flags are for class qualifiers ? - * @return String representation of flags - */ - public static String accessToString( final int access_flags, final boolean for_class ) { - final StringBuilder buf = new StringBuilder(); - int p = 0; - for (int i = 0; p < Const.MAX_ACC_FLAG_I; i++) { // Loop through known flags - p = pow2(i); - if ((access_flags & p) != 0) { - /* Special case: Classes compiled with new compilers and with the - * `ACC_SUPER' flag would be said to be "synchronized". This is - * because SUN used the same value for the flags `ACC_SUPER' and - * `ACC_SYNCHRONIZED'. - */ - if (for_class && ((p == Const.ACC_SUPER) || (p == Const.ACC_INTERFACE))) { - continue; - } - buf.append(Const.getAccessName(i)).append(" "); - } - } - return buf.toString().trim(); - } - - - /** - * @param access_flags the class flags - * - * @return "class" or "interface", depending on the ACC_INTERFACE flag - */ - public static String classOrInterface( final int access_flags ) { - return ((access_flags & Const.ACC_INTERFACE) != 0) ? "interface" : "class"; - } - - - /** - * Disassemble a byte array of JVM byte codes starting from code line - * `index' and return the disassembled string representation. Decode only - * `num' opcodes (including their operands), use -1 if you want to - * decompile everything. - * - * @param code byte code array - * @param constant_pool Array of constants - * @param index offset in `code' array - * (number of opcodes, not bytes!) - * @param length number of opcodes to decompile, -1 for all - * @param verbose be verbose, e.g. print constant pool index - * @return String representation of byte codes - */ - public static String codeToString( final byte[] code, final ConstantPool constant_pool, final int index, - final int length, final boolean verbose ) { - final StringBuilder buf = new StringBuilder(code.length * 20); // Should be sufficient // CHECKSTYLE IGNORE MagicNumber - try (ByteSequence stream = new ByteSequence(code)) { - for (int i = 0; i < index; i++) { - codeToString(stream, constant_pool, verbose); - } - for (int i = 0; stream.available() > 0; i++) { - if ((length < 0) || (i < length)) { - final String indices = fillup(stream.getIndex() + ":", 6, true, ' '); - buf.append(indices).append(codeToString(stream, constant_pool, verbose)).append('\n'); - } - } - } catch (final IOException e) { - throw new ClassFormatException("Byte code error: " + buf.toString(), e); - } - return buf.toString(); - } - - - public static String codeToString( final byte[] code, final ConstantPool constant_pool, final int index, final int length ) { - return codeToString(code, constant_pool, index, length, true); - } - - - /** - * Disassemble a stream of byte codes and return the - * string representation. - * - * @param bytes stream of bytes - * @param constant_pool Array of constants - * @param verbose be verbose, e.g. print constant pool index - * @return String representation of byte code - * - * @throws IOException if a failure from reading from the bytes argument occurs - */ - public static String codeToString( final ByteSequence bytes, final ConstantPool constant_pool, - final boolean verbose ) throws IOException { - final short opcode = (short) bytes.readUnsignedByte(); - int default_offset = 0; - int low; - int high; - int npairs; - int index; - int vindex; - int constant; - int[] match; - int[] jump_table; - int no_pad_bytes = 0; - int offset; - final StringBuilder buf = new StringBuilder(Const.getOpcodeName(opcode)); - /* Special case: Skip (0-3) padding bytes, i.e., the - * following bytes are 4-byte-aligned - */ - if ((opcode == Const.TABLESWITCH) || (opcode == Const.LOOKUPSWITCH)) { - final int remainder = bytes.getIndex() % 4; - no_pad_bytes = (remainder == 0) ? 0 : 4 - remainder; - for (int i = 0; i < no_pad_bytes; i++) { - byte b; - if ((b = bytes.readByte()) != 0) { - System.err.println("Warning: Padding byte != 0 in " - + Const.getOpcodeName(opcode) + ":" + b); - } - } - // Both cases have a field default_offset in common - default_offset = bytes.readInt(); - } - switch (opcode) { - /* Table switch has variable length arguments. - */ - case Const.TABLESWITCH: - low = bytes.readInt(); - high = bytes.readInt(); - offset = bytes.getIndex() - 12 - no_pad_bytes - 1; - default_offset += offset; - buf.append("\tdefault = ").append(default_offset).append(", low = ").append(low) - .append(", high = ").append(high).append("("); - jump_table = new int[high - low + 1]; - for (int i = 0; i < jump_table.length; i++) { - jump_table[i] = offset + bytes.readInt(); - buf.append(jump_table[i]); - if (i < jump_table.length - 1) { - buf.append(", "); - } - } - buf.append(")"); - break; - /* Lookup switch has variable length arguments. - */ - case Const.LOOKUPSWITCH: { - npairs = bytes.readInt(); - offset = bytes.getIndex() - 8 - no_pad_bytes - 1; - match = new int[npairs]; - jump_table = new int[npairs]; - default_offset += offset; - buf.append("\tdefault = ").append(default_offset).append(", npairs = ").append( - npairs).append(" ("); - for (int i = 0; i < npairs; i++) { - match[i] = bytes.readInt(); - jump_table[i] = offset + bytes.readInt(); - buf.append("(").append(match[i]).append(", ").append(jump_table[i]).append(")"); - if (i < npairs - 1) { - buf.append(", "); - } - } - buf.append(")"); - } - break; - /* Two address bytes + offset from start of byte stream form the - * jump target - */ - case Const.GOTO: - case Const.IFEQ: - case Const.IFGE: - case Const.IFGT: - case Const.IFLE: - case Const.IFLT: - case Const.JSR: - case Const.IFNE: - case Const.IFNONNULL: - case Const.IFNULL: - case Const.IF_ACMPEQ: - case Const.IF_ACMPNE: - case Const.IF_ICMPEQ: - case Const.IF_ICMPGE: - case Const.IF_ICMPGT: - case Const.IF_ICMPLE: - case Const.IF_ICMPLT: - case Const.IF_ICMPNE: - buf.append("\t\t#").append((bytes.getIndex() - 1) + bytes.readShort()); - break; - /* 32-bit wide jumps - */ - case Const.GOTO_W: - case Const.JSR_W: - buf.append("\t\t#").append((bytes.getIndex() - 1) + bytes.readInt()); - break; - /* Index byte references local variable (register) - */ - case Const.ALOAD: - case Const.ASTORE: - case Const.DLOAD: - case Const.DSTORE: - case Const.FLOAD: - case Const.FSTORE: - case Const.ILOAD: - case Const.ISTORE: - case Const.LLOAD: - case Const.LSTORE: - case Const.RET: - if (wide) { - vindex = bytes.readUnsignedShort(); - wide = false; // Clear flag - } else { - vindex = bytes.readUnsignedByte(); - } - buf.append("\t\t%").append(vindex); - break; - /* - * Remember wide byte which is used to form a 16-bit address in the - * following instruction. Relies on that the method is called again with - * the following opcode. - */ - case Const.WIDE: - wide = true; - buf.append("\t(wide)"); - break; - /* Array of basic type. - */ - case Const.NEWARRAY: - buf.append("\t\t<").append(Const.getTypeName(bytes.readByte())).append(">"); - break; - /* Access object/class fields. - */ - case Const.GETFIELD: - case Const.GETSTATIC: - case Const.PUTFIELD: - case Const.PUTSTATIC: - index = bytes.readUnsignedShort(); - buf.append("\t\t").append( - constant_pool.constantToString(index, Const.CONSTANT_Fieldref)).append( - verbose ? " (" + index + ")" : ""); - break; - /* Operands are references to classes in constant pool - */ - case Const.NEW: - case Const.CHECKCAST: - buf.append("\t"); - //$FALL-THROUGH$ - case Const.INSTANCEOF: - index = bytes.readUnsignedShort(); - buf.append("\t<").append( - constant_pool.constantToString(index, Const.CONSTANT_Class)) - .append(">").append(verbose ? " (" + index + ")" : ""); - break; - /* Operands are references to methods in constant pool - */ - case Const.INVOKESPECIAL: - case Const.INVOKESTATIC: - index = bytes.readUnsignedShort(); - final Constant c = constant_pool.getConstant(index); - // With Java8 operand may be either a CONSTANT_Methodref - // or a CONSTANT_InterfaceMethodref. (markro) - buf.append("\t").append( - constant_pool.constantToString(index, c.getTag())) - .append(verbose ? " (" + index + ")" : ""); - break; - case Const.INVOKEVIRTUAL: - index = bytes.readUnsignedShort(); - buf.append("\t").append( - constant_pool.constantToString(index, Const.CONSTANT_Methodref)) - .append(verbose ? " (" + index + ")" : ""); - break; - case Const.INVOKEINTERFACE: - index = bytes.readUnsignedShort(); - final int nargs = bytes.readUnsignedByte(); // historical, redundant - buf.append("\t").append( - constant_pool - .constantToString(index, Const.CONSTANT_InterfaceMethodref)) - .append(verbose ? " (" + index + ")\t" : "").append(nargs).append("\t") - .append(bytes.readUnsignedByte()); // Last byte is a reserved space - break; - case Const.INVOKEDYNAMIC: - index = bytes.readUnsignedShort(); - buf.append("\t").append( - constant_pool - .constantToString(index, Const.CONSTANT_InvokeDynamic)) - .append(verbose ? " (" + index + ")\t" : "") - .append(bytes.readUnsignedByte()) // Thrid byte is a reserved space - .append(bytes.readUnsignedByte()); // Last byte is a reserved space - break; - /* Operands are references to items in constant pool - */ - case Const.LDC_W: - case Const.LDC2_W: - index = bytes.readUnsignedShort(); - buf.append("\t\t").append( - constant_pool.constantToString(index, constant_pool.getConstant(index) - .getTag())).append(verbose ? " (" + index + ")" : ""); - break; - case Const.LDC: - index = bytes.readUnsignedByte(); - buf.append("\t\t").append( - constant_pool.constantToString(index, constant_pool.getConstant(index) - .getTag())).append(verbose ? " (" + index + ")" : ""); - break; - /* Array of references. - */ - case Const.ANEWARRAY: - index = bytes.readUnsignedShort(); - buf.append("\t\t<").append( - compactClassName(constant_pool.getConstantString(index, - Const.CONSTANT_Class), false)).append(">").append( - verbose ? " (" + index + ")" : ""); - break; - /* Multidimensional array of references. - */ - case Const.MULTIANEWARRAY: { - index = bytes.readUnsignedShort(); - final int dimensions = bytes.readUnsignedByte(); - buf.append("\t<").append( - compactClassName(constant_pool.getConstantString(index, - Const.CONSTANT_Class), false)).append(">\t").append(dimensions) - .append(verbose ? " (" + index + ")" : ""); - } - break; - /* Increment local variable. - */ - case Const.IINC: - if (wide) { - vindex = bytes.readUnsignedShort(); - constant = bytes.readShort(); - wide = false; - } else { - vindex = bytes.readUnsignedByte(); - constant = bytes.readByte(); - } - buf.append("\t\t%").append(vindex).append("\t").append(constant); - break; - default: - if (Const.getNoOfOperands(opcode) > 0) { - for (int i = 0; i < Const.getOperandTypeCount(opcode); i++) { - buf.append("\t\t"); - switch (Const.getOperandType(opcode, i)) { - case Const.T_BYTE: - buf.append(bytes.readByte()); - break; - case Const.T_SHORT: - buf.append(bytes.readShort()); - break; - case Const.T_INT: - buf.append(bytes.readInt()); - break; - default: // Never reached - throw new IllegalStateException("Unreachable default case reached!"); - } - } - } - } - return buf.toString(); - } - - - public static String codeToString( final ByteSequence bytes, final ConstantPool constant_pool ) - throws IOException { - return codeToString(bytes, constant_pool, true); - } - - - /** - * Shorten long class names, java/lang/String becomes - * String. - * - * @param str The long class name - * @return Compacted class name - */ - public static String compactClassName( final String str ) { - return compactClassName(str, true); - } - - - /** - * Shorten long class names, java/lang/String becomes - * java.lang.String, - * e.g.. If chopit is true the prefix java.lang - * is also removed. - * - * @param str The long class name - * @param chopit flag that determines whether chopping is executed or not - * @return Compacted class name - */ - public static String compactClassName( final String str, final boolean chopit ) { - return compactClassName(str, "java.lang.", chopit); - } - - - /** - * Shorten long class name str, i.e., chop off the prefix, - * if the - * class name starts with this string and the flag chopit is true. - * Slashes / are converted to dots .. - * - * @param str The long class name - * @param prefix The prefix the get rid off - * @param chopit flag that determines whether chopping is executed or not - * @return Compacted class name - */ - public static String compactClassName( String str, final String prefix, final boolean chopit ) { - final int len = prefix.length(); - str = str.replace('/', '.'); // Is `/' on all systems, even DOS - if (chopit) { - // If string starts with `prefix' and contains no further dots - if (str.startsWith(prefix) && (str.substring(len).indexOf('.') == -1)) { - str = str.substring(len); - } - } - return str; - } - - - /** - * @return `flag' with bit `i' set to 1 - */ - public static int setBit( final int flag, final int i ) { - return flag | pow2(i); - } - - - /** - * @return `flag' with bit `i' set to 0 - */ - public static int clearBit( final int flag, final int i ) { - final int bit = pow2(i); - return (flag & bit) == 0 ? flag : flag ^ bit; - } - - - /** - * @return true, if bit `i' in `flag' is set - */ - public static boolean isSet( final int flag, final int i ) { - return (flag & pow2(i)) != 0; - } - - - /** - * Converts string containing the method return and argument types - * to a byte code method signature. - * - * @param ret Return type of method - * @param argv Types of method arguments - * @return Byte code representation of method signature - * - * @throws ClassFormatException if the signature is for Void - */ - public static String methodTypeToSignature( final String ret, final String[] argv ) - throws ClassFormatException { - final StringBuilder buf = new StringBuilder("("); - String str; - if (argv != null) { - for (final String element : argv) { - str = getSignature(element); - if (str.endsWith("V")) { - throw new ClassFormatException("Invalid type: " + element); - } - buf.append(str); - } - } - str = getSignature(ret); - buf.append(")").append(str); - return buf.toString(); - } - - - /** - * Converts argument list portion of method signature to string with all class names compacted. - * - * @param signature Method signature - * @return String Array of argument types - * @throws ClassFormatException - */ - public static String[] methodSignatureArgumentTypes( final String signature ) - throws ClassFormatException { - return methodSignatureArgumentTypes(signature, true); - } - - - /** - * Converts argument list portion of method signature to string. - * - * @param signature Method signature - * @param chopit flag that determines whether chopping is executed or not - * @return String Array of argument types - * @throws ClassFormatException - */ - public static String[] methodSignatureArgumentTypes( final String signature, final boolean chopit ) - throws ClassFormatException { - final List vec = new ArrayList<>(); - int index; - try { - // Skip any type arguments to read argument declarations between `(' and `)' - index = signature.indexOf('(') + 1; - if (index <= 0) { - throw new ClassFormatException("Invalid method signature: " + signature); - } - while (signature.charAt(index) != ')') { - vec.add(typeSignatureToString(signature.substring(index), chopit)); - //corrected concurrent private static field acess - index += unwrap(consumed_chars); // update position - } - } catch (final StringIndexOutOfBoundsException e) { // Should never occur - throw new ClassFormatException("Invalid method signature: " + signature, e); - } - return vec.toArray(new String[vec.size()]); - } - - - /** - * Converts return type portion of method signature to string with all class names compacted. - * - * @param signature Method signature - * @return String representation of method return type - * @throws ClassFormatException - */ - public static String methodSignatureReturnType( final String signature ) throws ClassFormatException { - return methodSignatureReturnType(signature, true); - } - - - /** - * Converts return type portion of method signature to string. - * - * @param signature Method signature - * @param chopit flag that determines whether chopping is executed or not - * @return String representation of method return type - * @throws ClassFormatException - */ - public static String methodSignatureReturnType( final String signature, final boolean chopit ) throws ClassFormatException { - int index; - String type; - try { - // Read return type after `)' - index = signature.lastIndexOf(')') + 1; - if (index <= 0) { - throw new ClassFormatException("Invalid method signature: " + signature); - } - type = typeSignatureToString(signature.substring(index), chopit); - } catch (final StringIndexOutOfBoundsException e) { // Should never occur - throw new ClassFormatException("Invalid method signature: " + signature, e); - } - return type; - } - - - /** - * Converts method signature to string with all class names compacted. - * - * @param signature to convert - * @param name of method - * @param access flags of method - * @return Human readable signature - */ - public static String methodSignatureToString( final String signature, final String name, final String access ) { - return methodSignatureToString(signature, name, access, true); - } - - - /** - * Converts method signature to string. - * - * @param signature to convert - * @param name of method - * @param access flags of method - * @param chopit flag that determines whether chopping is executed or not - * @return Human readable signature - */ - public static String methodSignatureToString( final String signature, final String name, final String access, final boolean chopit ) { - return methodSignatureToString(signature, name, access, chopit, null); - } - - - /** - * This method converts a method signature string into a Java type declaration like - * `void main(String[])' and throws a `ClassFormatException' when the parsed - * type is invalid. - * - * @param signature Method signature - * @param name Method name - * @param access Method access rights - * @param chopit flag that determines whether chopping is executed or not - * @param vars the LocalVariableTable for the method - * @return Java type declaration - * @throws ClassFormatException - */ - public static String methodSignatureToString( final String signature, final String name, - final String access, final boolean chopit, final LocalVariableTable vars ) throws ClassFormatException { - final StringBuilder buf = new StringBuilder("("); - String type; - int index; - int var_index = access.contains("static") ? 0 : 1; - try { - // Skip any type arguments to read argument declarations between `(' and `)' - index = signature.indexOf('(') + 1; - if (index <= 0) { - throw new ClassFormatException("Invalid method signature: " + signature); - } - while (signature.charAt(index) != ')') { - final String param_type = typeSignatureToString(signature.substring(index), chopit); - buf.append(param_type); - if (vars != null) { - final LocalVariable l = vars.getLocalVariable(var_index, 0); - if (l != null) { - buf.append(" ").append(l.getName()); - } - } else { - buf.append(" arg").append(var_index); - } - if ("double".equals(param_type) || "long".equals(param_type)) { - var_index += 2; - } else { - var_index++; - } - buf.append(", "); - //corrected concurrent private static field acess - index += unwrap(consumed_chars); // update position - } - index++; // update position - // Read return type after `)' - type = typeSignatureToString(signature.substring(index), chopit); - } catch (final StringIndexOutOfBoundsException e) { // Should never occur - throw new ClassFormatException("Invalid method signature: " + signature, e); - } - // ignore any throws information in the signature - if (buf.length() > 1) { - buf.setLength(buf.length() - 2); - } - buf.append(")"); - return access + ((access.length() > 0) ? " " : "") + // May be an empty string - type + " " + name + buf.toString(); - } - - - private static int pow2( final int n ) { - return 1 << n; - } - - - /** - * Replace all occurrences of old in str with new. - * - * @param str String to permute - * @param old String to be replaced - * @param new_ Replacement string - * @return new String object - */ - public static String replace( String str, final String old, final String new_ ) { - int index; - int old_index; - try { - if (str.contains(old)) { // `old' found in str - final StringBuilder buf = new StringBuilder(); - old_index = 0; // String start offset - // While we have something to replace - while ((index = str.indexOf(old, old_index)) != -1) { - buf.append(str.substring(old_index, index)); // append prefix - buf.append(new_); // append replacement - old_index = index + old.length(); // Skip `old'.length chars - } - buf.append(str.substring(old_index)); // append rest of string - str = buf.toString(); - } - } catch (final StringIndexOutOfBoundsException e) { // Should not occur - System.err.println(e); - } - return str; - } - - - /** - * WARNING: - * - * There is some nomenclature confusion through much of the BCEL code base with - * respect to the terms Descriptor and Signature. For the offical definitions see: - * - * @see - * Descriptors in The Java Virtual Machine Specification - * - * @see - * Signatures in The Java Virtual Machine Specification - * - * In brief, a descriptor is a string representing the type of a field or method. - * Signatures are similar, but more complex. Signatures are used to encode declarations - * written in the Java programming language that use types outside the type system of the - * Java Virtual Machine. They are used to describe the type of any class, interface, - * constructor, method or field whose declaration uses type variables or parameterized types. - * - * To parse a descriptor, call typeSignatureToString. - * To parse a signature, call signatureToString. - * - * Note that if the signature string is a single, non-generic item, the call to - * signatureToString reduces to a call to typeSignatureToString. - * Also note, that if you only wish to parse the first item in a longer signature - * string, you should call typeSignatureToString directly. - */ - - - /** - * Converts a signature to a string with all class names compacted. - * Class, Method and Type signatures are supported. - * Enum and Interface signatures are not supported. - * - * @param signature signature to convert - * @return String containg human readable signature - */ - public static String signatureToString( final String signature ) { - return signatureToString(signature, true); - } - - - /** - * Converts a signature to a string. - * Class, Method and Type signatures are supported. - * Enum and Interface signatures are not supported. - * - * @param signature signature to convert - * @param chopit flag that determines whether chopping is executed or not - * @return String containg human readable signature - */ - public static String signatureToString( final String signature, final boolean chopit ) { - String type = ""; - String typeParams = ""; - int index = 0; - if (signature.charAt(0) == '<') { - // we have type paramters - typeParams = typeParamTypesToString(signature, chopit); - index += unwrap(consumed_chars); // update position - } - if (signature.charAt(index) == '(') { - // We have a Method signature. - // add types of arguments - type = typeParams + typeSignaturesToString(signature.substring(index), chopit, ')'); - index += unwrap(consumed_chars); // update position - // add return type - type = type + typeSignatureToString(signature.substring(index), chopit); - index += unwrap(consumed_chars); // update position - // ignore any throws information in the signature - return type; - } - // Could be Class or Type... - type = typeSignatureToString(signature.substring(index), chopit); - index += unwrap(consumed_chars); // update position - if ((typeParams.length() == 0) && (index == signature.length())) { - // We have a Type signature. - return type; - } - // We have a Class signature. - final StringBuilder typeClass = new StringBuilder(typeParams); - typeClass.append(" extends "); - typeClass.append(type); - if (index < signature.length()) { - typeClass.append(" implements "); - typeClass.append(typeSignatureToString(signature.substring(index), chopit)); - index += unwrap(consumed_chars); // update position - } - while (index < signature.length()) { - typeClass.append(", "); - typeClass.append(typeSignatureToString(signature.substring(index), chopit)); - index += unwrap(consumed_chars); // update position - } - return typeClass.toString(); - } - - - /** - * Converts a type parameter list signature to a string. - * - * @param signature signature to convert - * @param chopit flag that determines whether chopping is executed or not - * @return String containg human readable signature - */ - private static String typeParamTypesToString( final String signature, final boolean chopit ) { - // The first character is guranteed to be '<' - final StringBuilder typeParams = new StringBuilder("<"); - int index = 1; // skip the '<' - // get the first TypeParameter - typeParams.append(typeParamTypeToString(signature.substring(index), chopit)); - index += unwrap(consumed_chars); // update position - // are there more TypeParameters? - while (signature.charAt(index) != '>') { - typeParams.append(", "); - typeParams.append(typeParamTypeToString(signature.substring(index), chopit)); - index += unwrap(consumed_chars); // update position - } - wrap(consumed_chars, index + 1); // account for the '>' char - return typeParams.append(">").toString(); - } - - - /** - * Converts a type parameter signature to a string. - * - * @param signature signature to convert - * @param chopit flag that determines whether chopping is executed or not - * @return String containg human readable signature - */ - private static String typeParamTypeToString( final String signature, final boolean chopit ) { - int index = signature.indexOf(':'); - if (index <= 0) { - throw new ClassFormatException("Invalid type parameter signature: " + signature); - } - // get the TypeParameter identifier - final StringBuilder typeParam = new StringBuilder(signature.substring(0, index)); - index++; // account for the ':' - if (signature.charAt(index) != ':') { - // we have a class bound - typeParam.append(" extends "); - typeParam.append(typeSignatureToString(signature.substring(index), chopit)); - index += unwrap(consumed_chars); // update position - } - // look for interface bounds - while (signature.charAt(index) == ':') { - index++; // skip over the ':' - typeParam.append(" & "); - typeParam.append(typeSignatureToString(signature.substring(index), chopit)); - index += unwrap(consumed_chars); // update position - } - wrap(consumed_chars, index); - return typeParam.toString(); - } - - - /** - * Converts a list of type signatures to a string. - * - * @param signature signature to convert - * @param chopit flag that determines whether chopping is executed or not - * @param term character indicating the end of the list - * @return String containg human readable signature - */ - private static String typeSignaturesToString( final String signature, final boolean chopit, final char term ) { - // The first character will be an 'open' that matches the 'close' contained in term. - final StringBuilder typeList = new StringBuilder(signature.substring(0, 1)); - int index = 1; // skip the 'open' character - // get the first Type in the list - if (signature.charAt(index) != term) { - typeList.append(typeSignatureToString(signature.substring(index), chopit)); - index += unwrap(consumed_chars); // update position - } - // are there more types in the list? - while (signature.charAt(index) != term) { - typeList.append(", "); - typeList.append(typeSignatureToString(signature.substring(index), chopit)); - index += unwrap(consumed_chars); // update position - } - wrap(consumed_chars, index + 1); // account for the term char - return typeList.append(term).toString(); - } - - - /** - * - * This method converts a type signature string into a Java type declaration such as - * `String[]' and throws a `ClassFormatException' when the parsed type is invalid. - * - * @param signature type signature - * @param chopit flag that determines whether chopping is executed or not - * @return string containing human readable type signature - * @throws ClassFormatException - * @since 6.4.0 - */ - public static String typeSignatureToString( final String signature, final boolean chopit ) throws ClassFormatException { - //corrected concurrent private static field acess - wrap(consumed_chars, 1); // This is the default, read just one char like `B' - try { - switch (signature.charAt(0)) { - case 'B': - return "byte"; - case 'C': - return "char"; - case 'D': - return "double"; - case 'F': - return "float"; - case 'I': - return "int"; - case 'J': - return "long"; - case 'T': { // TypeVariableSignature - final int index = signature.indexOf(';'); // Look for closing `;' - if (index < 0) { - throw new ClassFormatException("Invalid type variable signature: " + signature); - } - //corrected concurrent private static field acess - wrap(consumed_chars, index + 1); // "Tblabla;" `T' and `;' are removed - return compactClassName(signature.substring(1, index), chopit); - } - case 'L': { // Full class name - // should this be a while loop? can there be more than - // one generic clause? (markro) - int fromIndex = signature.indexOf('<'); // generic type? - if (fromIndex < 0) { - fromIndex = 0; - } else { - fromIndex = signature.indexOf('>', fromIndex); - if (fromIndex < 0) { - throw new ClassFormatException("Invalid signature: " + signature); - } - } - final int index = signature.indexOf(';', fromIndex); // Look for closing `;' - if (index < 0) { - throw new ClassFormatException("Invalid signature: " + signature); - } - - // check to see if there are any TypeArguments - final int bracketIndex = signature.substring(0, index).indexOf('<'); - if (bracketIndex < 0) { - // just a class identifier - wrap(consumed_chars, index + 1); // "Lblabla;" `L' and `;' are removed - return compactClassName(signature.substring(1, index), chopit); - } - // but make sure we are not looking past the end of the current item - fromIndex = signature.indexOf(';'); - if (fromIndex < 0) { - throw new ClassFormatException("Invalid signature: " + signature); - } - if (fromIndex < bracketIndex) { - // just a class identifier - wrap(consumed_chars, fromIndex + 1); // "Lblabla;" `L' and `;' are removed - return compactClassName(signature.substring(1, fromIndex), chopit); - } - - // we have TypeArguments; build up partial result - // as we recurse for each TypeArgument - final StringBuilder type = new StringBuilder(compactClassName(signature.substring(1, bracketIndex), chopit)).append("<"); - int consumed_chars = bracketIndex + 1; // Shadows global var - - // check for wildcards - if (signature.charAt(consumed_chars) == '+') { - type.append("? extends "); - consumed_chars++; - } else if (signature.charAt(consumed_chars) == '-') { - type.append("? super "); - consumed_chars++; - } - - // get the first TypeArgument - if (signature.charAt(consumed_chars) == '*') { - type.append("?"); - consumed_chars++; - } else { - type.append(typeSignatureToString(signature.substring(consumed_chars), chopit)); - // update our consumed count by the number of characters the for type argument - consumed_chars = unwrap(Utility.consumed_chars) + consumed_chars; - wrap(Utility.consumed_chars, consumed_chars); - } - - // are there more TypeArguments? - while (signature.charAt(consumed_chars) != '>') { - type.append(", "); - // check for wildcards - if (signature.charAt(consumed_chars) == '+') { - type.append("? extends "); - consumed_chars++; - } else if (signature.charAt(consumed_chars) == '-') { - type.append("? super "); - consumed_chars++; - } - if (signature.charAt(consumed_chars) == '*') { - type.append("?"); - consumed_chars++; - } else { - type.append(typeSignatureToString(signature.substring(consumed_chars), chopit)); - // update our consumed count by the number of characters the for type argument - consumed_chars = unwrap(Utility.consumed_chars) + consumed_chars; - wrap(Utility.consumed_chars, consumed_chars); - } - } - - // process the closing ">" - consumed_chars++; - type.append(">"); - - if (signature.charAt(consumed_chars) == '.') { - // we have a ClassTypeSignatureSuffix - type.append("."); - // convert SimpleClassTypeSignature to fake ClassTypeSignature - // and then recurse to parse it - type.append(typeSignatureToString("L" + signature.substring(consumed_chars+1), chopit)); - // update our consumed count by the number of characters the for type argument - // note that this count includes the "L" we added, but that is ok - // as it accounts for the "." we didn't consume - consumed_chars = unwrap(Utility.consumed_chars) + consumed_chars; - wrap(Utility.consumed_chars, consumed_chars); - return type.toString(); - } - if (signature.charAt(consumed_chars) != ';') { - throw new ClassFormatException("Invalid signature: " + signature); - } - wrap(Utility.consumed_chars, consumed_chars + 1); // remove final ";" - return type.toString(); - } - case 'S': - return "short"; - case 'Z': - return "boolean"; - case '[': { // Array declaration - int n; - StringBuilder brackets; - String type; - int consumed_chars; // Shadows global var - brackets = new StringBuilder(); // Accumulate []'s - // Count opening brackets and look for optional size argument - for (n = 0; signature.charAt(n) == '['; n++) { - brackets.append("[]"); - } - consumed_chars = n; // Remember value - // The rest of the string denotes a `' - type = typeSignatureToString(signature.substring(n), chopit); - //corrected concurrent private static field acess - //Utility.consumed_chars += consumed_chars; is replaced by: - final int _temp = unwrap(Utility.consumed_chars) + consumed_chars; - wrap(Utility.consumed_chars, _temp); - return type + brackets.toString(); - } - case 'V': - return "void"; - default: - throw new ClassFormatException("Invalid signature: `" + signature + "'"); - } - } catch (final StringIndexOutOfBoundsException e) { // Should never occur - throw new ClassFormatException("Invalid signature: " + signature, e); - } - } - - - /** Parse Java type such as "char", or "java.lang.String[]" and return the - * signature in byte code format, e.g. "C" or "[Ljava/lang/String;" respectively. - * - * @param type Java type - * @return byte code signature - */ - public static String getSignature( String type ) { - final StringBuilder buf = new StringBuilder(); - final char[] chars = type.toCharArray(); - boolean char_found = false; - boolean delim = false; - int index = -1; - loop: for (int i = 0; i < chars.length; i++) { - switch (chars[i]) { - case ' ': - case '\t': - case '\n': - case '\r': - case '\f': - if (char_found) { - delim = true; - } - break; - case '[': - if (!char_found) { - throw new IllegalArgumentException("Illegal type: " + type); - } - index = i; - break loop; - default: - char_found = true; - if (!delim) { - buf.append(chars[i]); - } - } - } - int brackets = 0; - if (index > 0) { - brackets = countBrackets(type.substring(index)); - } - type = buf.toString(); - buf.setLength(0); - for (int i = 0; i < brackets; i++) { - buf.append('['); - } - boolean found = false; - for (int i = Const.T_BOOLEAN; (i <= Const.T_VOID) && !found; i++) { - if (Const.getTypeName(i).equals(type)) { - found = true; - buf.append(Const.getShortTypeName(i)); - } - } - if (!found) { - buf.append('L').append(type.replace('.', '/')).append(';'); - } - return buf.toString(); - } - - - private static int countBrackets( final String brackets ) { - final char[] chars = brackets.toCharArray(); - int count = 0; - boolean open = false; - for (final char c : chars) { - switch (c) { - case '[': - if (open) { - throw new IllegalArgumentException("Illegally nested brackets:" + brackets); - } - open = true; - break; - case ']': - if (!open) { - throw new IllegalArgumentException("Illegally nested brackets:" + brackets); - } - open = false; - count++; - break; - default: - // Don't care - break; - } - } - if (open) { - throw new IllegalArgumentException("Illegally nested brackets:" + brackets); - } - return count; - } - - - /** - * Return type of method signature as a byte value as defined in Constants - * - * @param signature in format described above - * @return type of method signature - * @see Const - * - * @throws ClassFormatException if signature is not a method signature - */ - public static byte typeOfMethodSignature( final String signature ) throws ClassFormatException { - int index; - try { - if (signature.charAt(0) != '(') { - throw new ClassFormatException("Invalid method signature: " + signature); - } - index = signature.lastIndexOf(')') + 1; - return typeOfSignature(signature.substring(index)); - } catch (final StringIndexOutOfBoundsException e) { - throw new ClassFormatException("Invalid method signature: " + signature, e); - } - } - - - /** - * Return type of signature as a byte value as defined in Constants - * - * @param signature in format described above - * @return type of signature - * @see Const - * - * @throws ClassFormatException if signature isn't a known type - */ - public static byte typeOfSignature( final String signature ) throws ClassFormatException { - try { - switch (signature.charAt(0)) { - case 'B': - return Const.T_BYTE; - case 'C': - return Const.T_CHAR; - case 'D': - return Const.T_DOUBLE; - case 'F': - return Const.T_FLOAT; - case 'I': - return Const.T_INT; - case 'J': - return Const.T_LONG; - case 'L': - case 'T': - return Const.T_REFERENCE; - case '[': - return Const.T_ARRAY; - case 'V': - return Const.T_VOID; - case 'Z': - return Const.T_BOOLEAN; - case 'S': - return Const.T_SHORT; - case '!': - case '+': - case '*': - return typeOfSignature(signature.substring(1)); - default: - throw new ClassFormatException("Invalid method signature: " + signature); - } - } catch (final StringIndexOutOfBoundsException e) { - throw new ClassFormatException("Invalid method signature: " + signature, e); - } - } - - - /** Map opcode names to opcode numbers. E.g., return Constants.ALOAD for "aload" - */ - public static short searchOpcode( String name ) { - name = name.toLowerCase(Locale.ENGLISH); - for (short i = 0; i < Const.OPCODE_NAMES_LENGTH; i++) { - if (Const.getOpcodeName(i).equals(name)) { - return i; - } - } - return -1; - } - - - /** - * Convert (signed) byte to (unsigned) short value, i.e., all negative - * values become positive. - */ - private static short byteToShort( final byte b ) { - return (b < 0) ? (short) (256 + b) : (short) b; - } - - - /** Convert bytes into hexadecimal string - * - * @param bytes an array of bytes to convert to hexadecimal - * - * @return bytes as hexadecimal string, e.g. 00 fa 12 ... - */ - public static String toHexString( final byte[] bytes ) { - final StringBuilder buf = new StringBuilder(); - for (int i = 0; i < bytes.length; i++) { - final short b = byteToShort(bytes[i]); - final String hex = Integer.toHexString(b); - if (b < 0x10) { - buf.append('0'); - } - buf.append(hex); - if (i < bytes.length - 1) { - buf.append(' '); - } - } - return buf.toString(); - } - - - /** - * Return a string for an integer justified left or right and filled up with - * `fill' characters if necessary. - * - * @param i integer to format - * @param length length of desired string - * @param left_justify format left or right - * @param fill fill character - * @return formatted int - */ - public static String format( final int i, final int length, final boolean left_justify, final char fill ) { - return fillup(Integer.toString(i), length, left_justify, fill); - } - - - /** - * Fillup char with up to length characters with char `fill' and justify it left or right. - * - * @param str string to format - * @param length length of desired string - * @param left_justify format left or right - * @param fill fill character - * @return formatted string - */ - public static String fillup( final String str, final int length, final boolean left_justify, final char fill ) { - final int len = length - str.length(); - final char[] buf = new char[(len < 0) ? 0 : len]; - for (int j = 0; j < buf.length; j++) { - buf[j] = fill; - } - if (left_justify) { - return str + new String(buf); - } - return new String(buf) + str; - } - - - static boolean equals( final byte[] a, final byte[] b ) { - int size; - if ((size = a.length) != b.length) { - return false; - } - for (int i = 0; i < size; i++) { - if (a[i] != b[i]) { - return false; - } - } - return true; - } - - - public static void printArray( final PrintStream out, final Object[] obj ) { - out.println(printArray(obj, true)); - } - - - public static void printArray( final PrintWriter out, final Object[] obj ) { - out.println(printArray(obj, true)); - } - - - public static String printArray( final Object[] obj ) { - return printArray(obj, true); - } - - - public static String printArray( final Object[] obj, final boolean braces ) { - return printArray(obj, braces, false); - } - - - public static String printArray( final Object[] obj, final boolean braces, final boolean quote ) { - if (obj == null) { - return null; - } - final StringBuilder buf = new StringBuilder(); - if (braces) { - buf.append('{'); - } - for (int i = 0; i < obj.length; i++) { - if (obj[i] != null) { - buf.append(quote ? "\"" : "").append(obj[i]).append(quote ? "\"" : ""); - } else { - buf.append("null"); - } - if (i < obj.length - 1) { - buf.append(", "); - } - } - if (braces) { - buf.append('}'); - } - return buf.toString(); - } - - - /** - * @param ch the character to test if it's part of an identifier - * - * @return true, if character is one of (a, ... z, A, ... Z, 0, ... 9, _) - */ - public static boolean isJavaIdentifierPart( final char ch ) { - return ((ch >= 'a') && (ch <= 'z')) || ((ch >= 'A') && (ch <= 'Z')) - || ((ch >= '0') && (ch <= '9')) || (ch == '_'); - } - - - /** - * Encode byte array it into Java identifier string, i.e., a string - * that only contains the following characters: (a, ... z, A, ... Z, - * 0, ... 9, _, $). The encoding algorithm itself is not too - * clever: if the current byte's ASCII value already is a valid Java - * identifier part, leave it as it is. Otherwise it writes the - * escape character($) followed by: - * - *
    - *
  • the ASCII value as a hexadecimal string, if the value is not in the range 200..247
    • - *
  • a Java identifier char not used in a lowercase hexadecimal string, if the value is in the range 200..247
    • - *
- * - *

This operation inflates the original byte array by roughly 40-50%

- * - * @param bytes the byte array to convert - * @param compress use gzip to minimize string - * - * @throws IOException if there's a gzip exception - */ - public static String encode(byte[] bytes, final boolean compress) throws IOException { - if (compress) { - try (ByteArrayOutputStream baos = new ByteArrayOutputStream(); - GZIPOutputStream gos = new GZIPOutputStream(baos)) { - gos.write(bytes, 0, bytes.length); - bytes = baos.toByteArray(); - } - } - final CharArrayWriter caw = new CharArrayWriter(); - try (JavaWriter jw = new JavaWriter(caw)) { - for (final byte b : bytes) { - final int in = b & 0x000000ff; // Normalize to unsigned - jw.write(in); - } - } - return caw.toString(); - } - - - /** - * Decode a string back to a byte array. - * - * @param s the string to convert - * @param uncompress use gzip to uncompress the stream of bytes - * - * @throws IOException if there's a gzip exception - */ - public static byte[] decode(final String s, final boolean uncompress) throws IOException { - byte[] bytes; - try (JavaReader jr = new JavaReader(new CharArrayReader(s.toCharArray())); - ByteArrayOutputStream bos = new ByteArrayOutputStream()) { - int ch; - while ((ch = jr.read()) >= 0) { - bos.write(ch); - } - bytes = bos.toByteArray(); - } - if (uncompress) { - final GZIPInputStream gis = new GZIPInputStream(new ByteArrayInputStream(bytes)); - final byte[] tmp = new byte[bytes.length * 3]; // Rough estimate - int count = 0; - int b; - while ((b = gis.read()) >= 0) { - tmp[count++] = (byte) b; - } - bytes = new byte[count]; - System.arraycopy(tmp, 0, bytes, 0, count); - } - return bytes; - } - - // A-Z, g-z, _, $ - private static final int FREE_CHARS = 48; - private static int[] CHAR_MAP = new int[FREE_CHARS]; - private static int[] MAP_CHAR = new int[256]; // Reverse map - private static final char ESCAPE_CHAR = '$'; - static { - int j = 0; - for (int i = 'A'; i <= 'Z'; i++) { - CHAR_MAP[j] = i; - MAP_CHAR[i] = j; - j++; - } - for (int i = 'g'; i <= 'z'; i++) { - CHAR_MAP[j] = i; - MAP_CHAR[i] = j; - j++; - } - CHAR_MAP[j] = '$'; - MAP_CHAR['$'] = j; - j++; - CHAR_MAP[j] = '_'; - MAP_CHAR['_'] = j; - } - - /** - * Decode characters into bytes. - * Used by decode() - */ - private static class JavaReader extends FilterReader { - - public JavaReader(final Reader in) { - super(in); - } - - - @Override - public int read() throws IOException { - final int b = in.read(); - if (b != ESCAPE_CHAR) { - return b; - } - final int i = in.read(); - if (i < 0) { - return -1; - } - if (((i >= '0') && (i <= '9')) || ((i >= 'a') && (i <= 'f'))) { // Normal escape - final int j = in.read(); - if (j < 0) { - return -1; - } - final char[] tmp = { - (char) i, (char) j - }; - final int s = Integer.parseInt(new String(tmp), 16); - return s; - } - return MAP_CHAR[i]; - } - - - @Override - public int read( final char[] cbuf, final int off, final int len ) throws IOException { - for (int i = 0; i < len; i++) { - cbuf[off + i] = (char) read(); - } - return len; - } - } - - /** - * Encode bytes into valid java identifier characters. - * Used by encode() - */ - private static class JavaWriter extends FilterWriter { - - public JavaWriter(final Writer out) { - super(out); - } - - - @Override - public void write( final int b ) throws IOException { - if (isJavaIdentifierPart((char) b) && (b != ESCAPE_CHAR)) { - out.write(b); - } else { - out.write(ESCAPE_CHAR); // Escape character - // Special escape - if (b >= 0 && b < FREE_CHARS) { - out.write(CHAR_MAP[b]); - } else { // Normal escape - final char[] tmp = Integer.toHexString(b).toCharArray(); - if (tmp.length == 1) { - out.write('0'); - out.write(tmp[0]); - } else { - out.write(tmp[0]); - out.write(tmp[1]); - } - } - } - } - - - @Override - public void write( final char[] cbuf, final int off, final int len ) throws IOException { - for (int i = 0; i < len; i++) { - write(cbuf[off + i]); - } - } - - - @Override - public void write( final String str, final int off, final int len ) throws IOException { - write(str.toCharArray(), off, len); - } - } - - - /** - * Escape all occurences of newline chars '\n', quotes \", etc. - */ - public static String convertString( final String label ) { - final char[] ch = label.toCharArray(); - final StringBuilder buf = new StringBuilder(); - for (final char element : ch) { - switch (element) { - case '\n': - buf.append("\\n"); - break; - case '\r': - buf.append("\\r"); - break; - case '\"': - buf.append("\\\""); - break; - case '\'': - buf.append("\\'"); - break; - case '\\': - buf.append("\\\\"); - break; - default: - buf.append(element); - break; - } - } - return buf.toString(); - } - -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/Visitor.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/Visitor.java deleted file mode 100644 index 966b0043..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/Visitor.java +++ /dev/null @@ -1,235 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.classfile; - -/** - * Interface to make use of the Visitor pattern programming style. I.e. a class - * that implements this interface can traverse the contents of a Java class just - * by calling the `accept' method which all classes have. - * - */ -public interface Visitor -{ - void visitCode(Code obj); - - void visitCodeException(CodeException obj); - - void visitConstantClass(ConstantClass obj); - - void visitConstantDouble(ConstantDouble obj); - - void visitConstantFieldref(ConstantFieldref obj); - - void visitConstantFloat(ConstantFloat obj); - - void visitConstantInteger(ConstantInteger obj); - - void visitConstantInterfaceMethodref(ConstantInterfaceMethodref obj); - - void visitConstantInvokeDynamic(ConstantInvokeDynamic obj); - - void visitConstantLong(ConstantLong obj); - - void visitConstantMethodref(ConstantMethodref obj); - - void visitConstantNameAndType(ConstantNameAndType obj); - - void visitConstantPool(ConstantPool obj); - - void visitConstantString(ConstantString obj); - - void visitConstantUtf8(ConstantUtf8 obj); - - void visitConstantValue(ConstantValue obj); - - void visitDeprecated(Deprecated obj); - - void visitExceptionTable(ExceptionTable obj); - - void visitField(Field obj); - - void visitInnerClass(InnerClass obj); - - void visitInnerClasses(InnerClasses obj); - - void visitJavaClass(JavaClass obj); - - void visitLineNumber(LineNumber obj); - - void visitLineNumberTable(LineNumberTable obj); - - void visitLocalVariable(LocalVariable obj); - - void visitLocalVariableTable(LocalVariableTable obj); - - void visitMethod(Method obj); - - void visitSignature(Signature obj); - - void visitSourceFile(SourceFile obj); - - void visitSynthetic(Synthetic obj); - - void visitUnknown(Unknown obj); - - void visitStackMap(StackMap obj); - - void visitStackMapEntry(StackMapEntry obj); - - /** - * @since 6.0 - */ - void visitAnnotation(Annotations obj); - - /** - * @since 6.0 - */ - void visitParameterAnnotation(ParameterAnnotations obj); - - /** - * @since 6.0 - */ - void visitAnnotationEntry(AnnotationEntry obj); - - /** - * @since 6.0 - */ - void visitAnnotationDefault(AnnotationDefault obj); - - /** - * @since 6.0 - */ - void visitLocalVariableTypeTable(LocalVariableTypeTable obj); - - /** - * @since 6.0 - */ - void visitEnclosingMethod(EnclosingMethod obj); - - /** - * @since 6.0 - */ - void visitBootstrapMethods(BootstrapMethods obj); - - /** - * @since 6.0 - */ - void visitMethodParameters(MethodParameters obj); - - /** - * @since 6.4.0 - */ - default void visitMethodParameter(final MethodParameter obj) { - // empty - } - - /** - * @since 6.0 - */ - void visitConstantMethodType(ConstantMethodType obj); - - /** - * @since 6.0 - */ - void visitConstantMethodHandle(ConstantMethodHandle obj); - - /** - * @since 6.0 - */ - void visitParameterAnnotationEntry(ParameterAnnotationEntry obj); - - /** - * @since 6.1 - */ - void visitConstantPackage(ConstantPackage constantPackage); - - /** - * @since 6.1 - */ - void visitConstantModule(ConstantModule constantModule); - - /** - * @since 6.3 - */ - default void visitConstantDynamic(final ConstantDynamic constantDynamic) { - // empty - } - - /** - * @since 6.4.0 - */ - default void visitModule(final Module constantModule) { - // empty - } - - /** - * @since 6.4.0 - */ - default void visitModuleRequires(final ModuleRequires constantModule) { - // empty - } - - /** - * @since 6.4.0 - */ - default void visitModuleExports(final ModuleExports constantModule) { - // empty - } - - /** - * @since 6.4.0 - */ - default void visitModuleOpens(final ModuleOpens constantModule) { - // empty - } - - /** - * @since 6.4.0 - */ - default void visitModuleProvides(final ModuleProvides constantModule) { - // empty - } - - /** - * @since 6.4.0 - */ - default void visitModulePackages(final ModulePackages constantModule) { - // empty - } - - /** - * @since 6.4.0 - */ - default void visitModuleMainClass(final ModuleMainClass obj) { - // empty - } - - /** - * @since 6.4.0 - */ - default void visitNestHost(final NestHost obj) { - // empty - } - - /** - * @since 6.4.0 - */ - default void visitNestMembers(final NestMembers obj) { - // empty - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/package.html b/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/package.html deleted file mode 100644 index 4a9c4b30..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/classfile/package.html +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - -

-This package contains the classes that describe the structure of a -Java class file and a class file parser. -

- - diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/AALOAD.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/AALOAD.java deleted file mode 100644 index 00f877cf..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/AALOAD.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * AALOAD - Load reference from array - * 
Stack: ..., arrayref, index -> value
- * - */ -public class AALOAD extends ArrayInstruction implements StackProducer { - - /** Load reference from array - */ - public AALOAD() { - super(org.apache.bcel.Const.AALOAD); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackProducer(this); - v.visitExceptionThrower(this); - v.visitTypedInstruction(this); - v.visitArrayInstruction(this); - v.visitAALOAD(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/AASTORE.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/AASTORE.java deleted file mode 100644 index 4cff415c..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/AASTORE.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * AASTORE - Store into reference array - * 
Stack: ..., arrayref, index, value -> ...
- * - */ -public class AASTORE extends ArrayInstruction implements StackConsumer { - - /** Store into reference array - */ - public AASTORE() { - super(org.apache.bcel.Const.AASTORE); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackConsumer(this); - v.visitExceptionThrower(this); - v.visitTypedInstruction(this); - v.visitArrayInstruction(this); - v.visitAASTORE(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ACONST_NULL.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ACONST_NULL.java deleted file mode 100644 index 9443b293..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ACONST_NULL.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * ACONST_NULL - Push null reference - * 
Stack: ... -> ..., null
- * - */ -public class ACONST_NULL extends Instruction implements PushInstruction, TypedInstruction { - - /** - * Push null reference - */ - public ACONST_NULL() { - super(org.apache.bcel.Const.ACONST_NULL, (short) 1); - } - - - /** @return Type.NULL - */ - @Override - public Type getType( final ConstantPoolGen cp ) { - return Type.NULL; - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackProducer(this); - v.visitPushInstruction(this); - v.visitTypedInstruction(this); - v.visitACONST_NULL(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ALOAD.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ALOAD.java deleted file mode 100644 index aebc432f..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ALOAD.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * ALOAD - Load reference from local variable - * 
Stack: ... -> ..., objectref
- * - */ -public class ALOAD extends LoadInstruction { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - ALOAD() { - super(org.apache.bcel.Const.ALOAD, org.apache.bcel.Const.ALOAD_0); - } - - - /** Load reference from local variable - * @param n index of local variable - */ - public ALOAD(final int n) { - super(org.apache.bcel.Const.ALOAD, org.apache.bcel.Const.ALOAD_0, n); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - super.accept(v); - v.visitALOAD(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ANEWARRAY.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ANEWARRAY.java deleted file mode 100644 index f63bf973..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ANEWARRAY.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import org.apache.bcel.ExceptionConst; - -/** - * ANEWARRAY - Create new array of references - * 
Stack: ..., count -> ..., arrayref
- * - */ -public class ANEWARRAY extends CPInstruction implements LoadClass, AllocationInstruction, - ExceptionThrower, StackConsumer, StackProducer { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - ANEWARRAY() { - } - - - public ANEWARRAY(final int index) { - super(org.apache.bcel.Const.ANEWARRAY, index); - } - - - @Override - public Class[] getExceptions() { - return ExceptionConst.createExceptions(ExceptionConst.EXCS.EXCS_CLASS_AND_INTERFACE_RESOLUTION, - ExceptionConst.NEGATIVE_ARRAY_SIZE_EXCEPTION); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitLoadClass(this); - v.visitAllocationInstruction(this); - v.visitExceptionThrower(this); - v.visitStackProducer(this); - v.visitTypedInstruction(this); - v.visitCPInstruction(this); - v.visitANEWARRAY(this); - } - - - @Override - public ObjectType getLoadClassType( final ConstantPoolGen cpg ) { - Type t = getType(cpg); - if (t instanceof ArrayType) { - t = ((ArrayType) t).getBasicType(); - } - return (t instanceof ObjectType) ? (ObjectType) t : null; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ARETURN.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ARETURN.java deleted file mode 100644 index 9d42fe9e..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ARETURN.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * ARETURN - Return reference from method - * 
Stack: ..., objectref -> <empty>
- * - */ -public class ARETURN extends ReturnInstruction { - - /** - * Return reference from method - */ - public ARETURN() { - super(org.apache.bcel.Const.ARETURN); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitExceptionThrower(this); - v.visitTypedInstruction(this); - v.visitStackConsumer(this); - v.visitReturnInstruction(this); - v.visitARETURN(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ARRAYLENGTH.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ARRAYLENGTH.java deleted file mode 100644 index ee8001b4..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ARRAYLENGTH.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import org.apache.bcel.ExceptionConst; - -/** - * ARRAYLENGTH - Get length of array - * 
Stack: ..., arrayref -> ..., length
- * - */ -public class ARRAYLENGTH extends Instruction implements ExceptionThrower, StackProducer, StackConsumer /* since 6.0 */ { - - /** Get length of array - */ - public ARRAYLENGTH() { - super(org.apache.bcel.Const.ARRAYLENGTH, (short) 1); - } - - - /** @return exceptions this instruction may cause - */ - @Override - public Class[] getExceptions() { - return new Class[] { - ExceptionConst.NULL_POINTER_EXCEPTION - }; - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitExceptionThrower(this); - v.visitStackProducer(this); - v.visitARRAYLENGTH(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ASTORE.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ASTORE.java deleted file mode 100644 index 150f8702..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ASTORE.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * ASTORE - Store reference into local variable - * 
Stack ..., objectref -> ...
- * - */ -public class ASTORE extends StoreInstruction { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - ASTORE() { - super(org.apache.bcel.Const.ASTORE, org.apache.bcel.Const.ASTORE_0); - } - - - /** Store reference into local variable - * @param n index of local variable - */ - public ASTORE(final int n) { - super(org.apache.bcel.Const.ASTORE, org.apache.bcel.Const.ASTORE_0, n); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - super.accept(v); - v.visitASTORE(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ATHROW.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ATHROW.java deleted file mode 100644 index 06656679..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ATHROW.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import org.apache.bcel.ExceptionConst; - -/** - * ATHROW - Throw exception - * 
Stack: ..., objectref -> objectref
- * - */ -public class ATHROW extends Instruction implements UnconditionalBranch, ExceptionThrower { - - /** - * Throw exception - */ - public ATHROW() { - super(org.apache.bcel.Const.ATHROW, (short) 1); - } - - - /** @return exceptions this instruction may cause - */ - @Override - public Class[] getExceptions() { - return new Class[] { - ExceptionConst.THROWABLE - }; - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitUnconditionalBranch(this); - v.visitExceptionThrower(this); - v.visitATHROW(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/AllocationInstruction.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/AllocationInstruction.java deleted file mode 100644 index 2ec1dd76..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/AllocationInstruction.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * Denote family of instructions that allocates space in the heap. - * - */ -public interface AllocationInstruction { -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/AnnotationElementValueGen.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/AnnotationElementValueGen.java deleted file mode 100644 index 9de92207..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/AnnotationElementValueGen.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.classfile.AnnotationElementValue; -import org.apache.bcel.classfile.ElementValue; - -/** - * @since 6.0 - */ -public class AnnotationElementValueGen extends ElementValueGen -{ - // For annotation element values, this is the annotation - private final AnnotationEntryGen a; - - public AnnotationElementValueGen(final AnnotationEntryGen a, final ConstantPoolGen cpool) - { - super(ANNOTATION, cpool); - this.a = a; - } - - public AnnotationElementValueGen(final int type, final AnnotationEntryGen annotation, - final ConstantPoolGen cpool) - { - super(type, cpool); - if (type != ANNOTATION) { - throw new IllegalArgumentException( - "Only element values of type annotation can be built with this ctor - type specified: " + type); - } - this.a = annotation; - } - - public AnnotationElementValueGen(final AnnotationElementValue value, - final ConstantPoolGen cpool, final boolean copyPoolEntries) - { - super(ANNOTATION, cpool); - a = new AnnotationEntryGen(value.getAnnotationEntry(), cpool, copyPoolEntries); - } - - @Override - public void dump(final DataOutputStream dos) throws IOException - { - dos.writeByte(super.getElementValueType()); // u1 type of value (ANNOTATION == '@') - a.dump(dos); - } - - @Override - public String stringifyValue() - { - throw new UnsupportedOperationException("Not implemented yet"); - } - - /** - * Return immutable variant of this AnnotationElementValueGen - */ - @Override - public ElementValue getElementValue() - { - return new AnnotationElementValue(super.getElementValueType(), - a.getAnnotation(), - getConstantPool().getConstantPool()); - } - - public AnnotationEntryGen getAnnotation() - { - return a; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/AnnotationEntryGen.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/AnnotationEntryGen.java deleted file mode 100644 index 016655de..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/AnnotationEntryGen.java +++ /dev/null @@ -1,355 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.DataInput; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -import org.apache.bcel.classfile.AnnotationEntry; -import org.apache.bcel.classfile.Attribute; -import org.apache.bcel.classfile.ConstantUtf8; -import org.apache.bcel.classfile.ElementValuePair; -import org.apache.bcel.classfile.RuntimeInvisibleAnnotations; -import org.apache.bcel.classfile.RuntimeInvisibleParameterAnnotations; -import org.apache.bcel.classfile.RuntimeVisibleAnnotations; -import org.apache.bcel.classfile.RuntimeVisibleParameterAnnotations; - -/** - * @since 6.0 - */ -public class AnnotationEntryGen { - private int typeIndex; - - private List evs; - - private final ConstantPoolGen cpool; - - private boolean isRuntimeVisible = false; - - /** - * Here we are taking a fixed annotation of type Annotation and building a - * modifiable AnnotationGen object. If the pool passed in is for a different - * class file, then copyPoolEntries should have been passed as true as that - * will force us to do a deep copy of the annotation and move the cpool - * entries across. We need to copy the type and the element name value pairs - * and the visibility. - */ - public AnnotationEntryGen(final AnnotationEntry a, final ConstantPoolGen cpool, - final boolean copyPoolEntries) { - this.cpool = cpool; - if (copyPoolEntries) { - typeIndex = cpool.addUtf8(a.getAnnotationType()); - } else { - typeIndex = a.getAnnotationTypeIndex(); - } - isRuntimeVisible = a.isRuntimeVisible(); - evs = copyValues(a.getElementValuePairs(), cpool, copyPoolEntries); - } - - private List copyValues(final ElementValuePair[] in, final ConstantPoolGen cpool, - final boolean copyPoolEntries) { - final List out = new ArrayList<>(); - for (final ElementValuePair nvp : in) { - out.add(new ElementValuePairGen(nvp, cpool, copyPoolEntries)); - } - return out; - } - - private AnnotationEntryGen(final ConstantPoolGen cpool) { - this.cpool = cpool; - } - - /** - * Retrieve an immutable version of this AnnotationGen - */ - public AnnotationEntry getAnnotation() { - final AnnotationEntry a = new AnnotationEntry(typeIndex, cpool.getConstantPool(), - isRuntimeVisible); - for (final ElementValuePairGen element : evs) { - a.addElementNameValuePair(element.getElementNameValuePair()); - } - return a; - } - - public AnnotationEntryGen(final ObjectType type, - final List elements, final boolean vis, - final ConstantPoolGen cpool) { - this.cpool = cpool; - this.typeIndex = cpool.addUtf8(type.getSignature()); - evs = elements; - isRuntimeVisible = vis; - } - - public static AnnotationEntryGen read(final DataInput dis, - final ConstantPoolGen cpool, final boolean b) throws IOException { - final AnnotationEntryGen a = new AnnotationEntryGen(cpool); - a.typeIndex = dis.readUnsignedShort(); - final int elemValuePairCount = dis.readUnsignedShort(); - for (int i = 0; i < elemValuePairCount; i++) { - final int nidx = dis.readUnsignedShort(); - a.addElementNameValuePair(new ElementValuePairGen(nidx, - ElementValueGen.readElementValue(dis, cpool), cpool)); - } - a.isRuntimeVisible(b); - return a; - } - - public void dump(final DataOutputStream dos) throws IOException { - dos.writeShort(typeIndex); // u2 index of type name in cpool - dos.writeShort(evs.size()); // u2 element_value pair count - for (final ElementValuePairGen envp : evs) { - envp.dump(dos); - } - } - - public void addElementNameValuePair(final ElementValuePairGen evp) { - if (evs == null) { - evs = new ArrayList<>(); - } - evs.add(evp); - } - - public int getTypeIndex() { - return typeIndex; - } - - public final String getTypeSignature() { - // ConstantClass c = (ConstantClass)cpool.getConstant(typeIndex); - final ConstantUtf8 utf8 = (ConstantUtf8) cpool - .getConstant(typeIndex/* c.getNameIndex() */); - return utf8.getBytes(); - } - - public final String getTypeName() { - return getTypeSignature();// BCELBUG: Should I use this instead? - // Utility.signatureToString(getTypeSignature()); - } - - /** - * Returns list of ElementNameValuePair objects - */ - public List getValues() { - return evs; - } - - @Override - public String toString() { - final StringBuilder s = new StringBuilder(32); // CHECKSTYLE IGNORE MagicNumber - s.append("AnnotationGen:[").append(getTypeName()).append(" #").append(evs.size()).append(" {"); - for (int i = 0; i < evs.size(); i++) { - s.append(evs.get(i)); - if (i + 1 < evs.size()) { - s.append(","); - } - } - s.append("}]"); - return s.toString(); - } - - public String toShortString() { - final StringBuilder s = new StringBuilder(); - s.append("@").append(getTypeName()).append("("); - for (int i = 0; i < evs.size(); i++) { - s.append(evs.get(i)); - if (i + 1 < evs.size()) { - s.append(","); - } - } - s.append(")"); - return s.toString(); - } - - private void isRuntimeVisible(final boolean b) { - isRuntimeVisible = b; - } - - public boolean isRuntimeVisible() { - return isRuntimeVisible; - } - - - /** - * Converts a list of AnnotationGen objects into a set of attributes - * that can be attached to the class file. - * - * @param cp The constant pool gen where we can create the necessary name refs - * @param annotationEntryGens An array of AnnotationGen objects - */ - static Attribute[] getAnnotationAttributes(final ConstantPoolGen cp, final AnnotationEntryGen[] annotationEntryGens) { - if (annotationEntryGens.length == 0) { - return new Attribute[0]; - } - - try { - int countVisible = 0; - int countInvisible = 0; - - // put the annotations in the right output stream - for (final AnnotationEntryGen a : annotationEntryGens) { - if (a.isRuntimeVisible()) { - countVisible++; - } else { - countInvisible++; - } - } - - final ByteArrayOutputStream rvaBytes = new ByteArrayOutputStream(); - final ByteArrayOutputStream riaBytes = new ByteArrayOutputStream(); - try (DataOutputStream rvaDos = new DataOutputStream(rvaBytes); - DataOutputStream riaDos = new DataOutputStream(riaBytes)) { - - rvaDos.writeShort(countVisible); - riaDos.writeShort(countInvisible); - - // put the annotations in the right output stream - for (final AnnotationEntryGen a : annotationEntryGens) { - if (a.isRuntimeVisible()) { - a.dump(rvaDos); - } else { - a.dump(riaDos); - } - } - } - - final byte[] rvaData = rvaBytes.toByteArray(); - final byte[] riaData = riaBytes.toByteArray(); - - int rvaIndex = -1; - int riaIndex = -1; - - if (rvaData.length > 2) { - rvaIndex = cp.addUtf8("RuntimeVisibleAnnotations"); - } - if (riaData.length > 2) { - riaIndex = cp.addUtf8("RuntimeInvisibleAnnotations"); - } - - final List newAttributes = new ArrayList<>(); - if (rvaData.length > 2) { - newAttributes.add( - new RuntimeVisibleAnnotations(rvaIndex, rvaData.length, - new DataInputStream(new ByteArrayInputStream(rvaData)), cp.getConstantPool())); - } - if (riaData.length > 2) { - newAttributes.add( - new RuntimeInvisibleAnnotations(riaIndex, riaData.length, - new DataInputStream(new ByteArrayInputStream(riaData)), cp.getConstantPool())); - } - - return newAttributes.toArray(new Attribute[newAttributes.size()]); - } catch (final IOException e) { - System.err.println("IOException whilst processing annotations"); - e.printStackTrace(); - } - return null; - } - - - /** - * Annotations against a class are stored in one of four attribute kinds: - * - RuntimeVisibleParameterAnnotations - * - RuntimeInvisibleParameterAnnotations - */ - static Attribute[] getParameterAnnotationAttributes( - final ConstantPoolGen cp, - final List[] /*Array of lists, array size depends on #params */vec) { - final int[] visCount = new int[vec.length]; - int totalVisCount = 0; - final int[] invisCount = new int[vec.length]; - int totalInvisCount = 0; - try { - for (int i = 0; i < vec.length; i++) { - if (vec[i] != null) { - for (final AnnotationEntryGen element : vec[i]) { - if (element.isRuntimeVisible()) { - visCount[i]++; - totalVisCount++; - } else { - invisCount[i]++; - totalInvisCount++; - } - } - } - } - // Lets do the visible ones - final ByteArrayOutputStream rvaBytes = new ByteArrayOutputStream(); - try (DataOutputStream rvaDos = new DataOutputStream(rvaBytes)) { - rvaDos.writeByte(vec.length); // First goes number of parameters - for (int i = 0; i < vec.length; i++) { - rvaDos.writeShort(visCount[i]); - if (visCount[i] > 0) { - for (final AnnotationEntryGen element : vec[i]) { - if (element.isRuntimeVisible()) { - element.dump(rvaDos); - } - } - } - } - } - // Lets do the invisible ones - final ByteArrayOutputStream riaBytes = new ByteArrayOutputStream(); - try (DataOutputStream riaDos = new DataOutputStream(riaBytes)) { - riaDos.writeByte(vec.length); // First goes number of parameters - for (int i = 0; i < vec.length; i++) { - riaDos.writeShort(invisCount[i]); - if (invisCount[i] > 0) { - for (final AnnotationEntryGen element : vec[i]) { - if (!element.isRuntimeVisible()) { - element.dump(riaDos); - } - } - } - } - } - final byte[] rvaData = rvaBytes.toByteArray(); - final byte[] riaData = riaBytes.toByteArray(); - int rvaIndex = -1; - int riaIndex = -1; - if (totalVisCount > 0) { - rvaIndex = cp.addUtf8("RuntimeVisibleParameterAnnotations"); - } - if (totalInvisCount > 0) { - riaIndex = cp.addUtf8("RuntimeInvisibleParameterAnnotations"); - } - final List newAttributes = new ArrayList<>(); - if (totalVisCount > 0) { - newAttributes - .add(new RuntimeVisibleParameterAnnotations(rvaIndex, - rvaData.length, new DataInputStream(new ByteArrayInputStream(rvaData)), cp.getConstantPool())); - } - if (totalInvisCount > 0) { - newAttributes - .add(new RuntimeInvisibleParameterAnnotations(riaIndex, - riaData.length, new DataInputStream(new ByteArrayInputStream(riaData)), cp.getConstantPool())); - } - return newAttributes.toArray(new Attribute[newAttributes.size()]); - } catch (final IOException e) { - System.err - .println("IOException whilst processing parameter annotations"); - e.printStackTrace(); - } - return null; - } - -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ArithmeticInstruction.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ArithmeticInstruction.java deleted file mode 100644 index b55f6df4..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ArithmeticInstruction.java +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import org.apache.bcel.Const; - -/** - * Super class for the family of arithmetic instructions. - * - */ -public abstract class ArithmeticInstruction extends Instruction implements TypedInstruction, - StackProducer, StackConsumer { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - ArithmeticInstruction() { - } - - - /** - * @param opcode of instruction - */ - protected ArithmeticInstruction(final short opcode) { - super(opcode, (short) 1); - } - - - /** @return type associated with the instruction - */ - @Override - public Type getType( final ConstantPoolGen cp ) { - final short _opcode = super.getOpcode(); - switch (_opcode) { - case Const.DADD: - case Const.DDIV: - case Const.DMUL: - case Const.DNEG: - case Const.DREM: - case Const.DSUB: - return Type.DOUBLE; - case Const.FADD: - case Const.FDIV: - case Const.FMUL: - case Const.FNEG: - case Const.FREM: - case Const.FSUB: - return Type.FLOAT; - case Const.IADD: - case Const.IAND: - case Const.IDIV: - case Const.IMUL: - case Const.INEG: - case Const.IOR: - case Const.IREM: - case Const.ISHL: - case Const.ISHR: - case Const.ISUB: - case Const.IUSHR: - case Const.IXOR: - return Type.INT; - case Const.LADD: - case Const.LAND: - case Const.LDIV: - case Const.LMUL: - case Const.LNEG: - case Const.LOR: - case Const.LREM: - case Const.LSHL: - case Const.LSHR: - case Const.LSUB: - case Const.LUSHR: - case Const.LXOR: - return Type.LONG; - default: // Never reached - throw new ClassGenException("Unknown type " + _opcode); - } - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ArrayElementValueGen.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ArrayElementValueGen.java deleted file mode 100644 index d7864b76..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ArrayElementValueGen.java +++ /dev/null @@ -1,127 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import java.io.DataOutputStream; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -import org.apache.bcel.classfile.ArrayElementValue; -import org.apache.bcel.classfile.ElementValue; - -/** - * @since 6.0 - */ -public class ArrayElementValueGen extends ElementValueGen -{ - // J5TODO: Should we make this an array or a list? A list would be easier to - // modify ... - private final List evalues; - - public ArrayElementValueGen(final ConstantPoolGen cp) - { - super(ARRAY, cp); - evalues = new ArrayList<>(); - } - - public ArrayElementValueGen(final int type, final ElementValue[] datums, - final ConstantPoolGen cpool) - { - super(type, cpool); - if (type != ARRAY) { - throw new IllegalArgumentException( - "Only element values of type array can be built with this ctor - type specified: " + type); - } - this.evalues = new ArrayList<>(); - for (final ElementValue datum : datums) { - evalues.add(ElementValueGen.copy(datum, cpool, true)); - } - } - - /** - * Return immutable variant of this ArrayElementValueGen - */ - @Override - public ElementValue getElementValue() - { - final ElementValue[] immutableData = new ElementValue[evalues.size()]; - int i = 0; - for (final ElementValueGen element : evalues) { - immutableData[i++] = element.getElementValue(); - } - return new ArrayElementValue(super.getElementValueType(), - immutableData, - getConstantPool().getConstantPool()); - } - - /** - * @param value - * @param cpool - */ - public ArrayElementValueGen(final ArrayElementValue value, final ConstantPoolGen cpool, - final boolean copyPoolEntries) - { - super(ARRAY, cpool); - evalues = new ArrayList<>(); - final ElementValue[] in = value.getElementValuesArray(); - for (final ElementValue element : in) { - evalues.add(ElementValueGen.copy(element, cpool, copyPoolEntries)); - } - } - - @Override - public void dump(final DataOutputStream dos) throws IOException - { - dos.writeByte(super.getElementValueType()); // u1 type of value (ARRAY == '[') - dos.writeShort(evalues.size()); - for (final ElementValueGen element : evalues) { - element.dump(dos); - } - } - - @Override - public String stringifyValue() - { - final StringBuilder sb = new StringBuilder(); - sb.append("["); - String comma = ""; - for (final ElementValueGen element : evalues) { - sb.append(comma); - comma = ","; - sb.append(element.stringifyValue()); - } - sb.append("]"); - return sb.toString(); - } - - public List getElementValues() - { - return evalues; - } - - public int getElementValuesSize() - { - return evalues.size(); - } - - public void addElement(final ElementValueGen gen) - { - evalues.add(gen); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ArrayInstruction.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ArrayInstruction.java deleted file mode 100644 index 725787ac..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ArrayInstruction.java +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import org.apache.bcel.ExceptionConst; - -/** - * Super class for instructions dealing with array access such as IALOAD. - * - */ -public abstract class ArrayInstruction extends Instruction implements ExceptionThrower, - TypedInstruction { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - ArrayInstruction() { - } - - - /** - * @param opcode of instruction - */ - protected ArrayInstruction(final short opcode) { - super(opcode, (short) 1); - } - - - @Override - public Class[] getExceptions() { - return ExceptionConst.createExceptions(ExceptionConst.EXCS.EXCS_ARRAY_EXCEPTION); - } - - - /** @return type associated with the instruction - */ - @Override - public Type getType( final ConstantPoolGen cp ) { - final short _opcode = super.getOpcode(); - switch (_opcode) { - case org.apache.bcel.Const.IALOAD: - case org.apache.bcel.Const.IASTORE: - return Type.INT; - case org.apache.bcel.Const.CALOAD: - case org.apache.bcel.Const.CASTORE: - return Type.CHAR; - case org.apache.bcel.Const.BALOAD: - case org.apache.bcel.Const.BASTORE: - return Type.BYTE; - case org.apache.bcel.Const.SALOAD: - case org.apache.bcel.Const.SASTORE: - return Type.SHORT; - case org.apache.bcel.Const.LALOAD: - case org.apache.bcel.Const.LASTORE: - return Type.LONG; - case org.apache.bcel.Const.DALOAD: - case org.apache.bcel.Const.DASTORE: - return Type.DOUBLE; - case org.apache.bcel.Const.FALOAD: - case org.apache.bcel.Const.FASTORE: - return Type.FLOAT; - case org.apache.bcel.Const.AALOAD: - case org.apache.bcel.Const.AASTORE: - return Type.OBJECT; - default: - throw new ClassGenException("Unknown case in switch" + _opcode); - } - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ArrayType.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ArrayType.java deleted file mode 100644 index 7c0ea091..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ArrayType.java +++ /dev/null @@ -1,128 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import org.apache.bcel.Const; - -/** - * Denotes array type, such as int[][] - * - */ -public final class ArrayType extends ReferenceType { - - private int dimensions; - private Type basicType; - - - /** - * Convenience constructor for array type, e.g. int[] - * - * @param type array type, e.g. T_INT - */ - public ArrayType(final byte type, final int dimensions) { - this(BasicType.getType(type), dimensions); - } - - - /** - * Convenience constructor for reference array type, e.g. Object[] - * - * @param class_name complete name of class (java.lang.String, e.g.) - */ - public ArrayType(final String class_name, final int dimensions) { - this(ObjectType.getInstance(class_name), dimensions); - } - - - /** - * Constructor for array of given type - * - * @param type type of array (may be an array itself) - */ - public ArrayType(final Type type, final int dimensions) { - super(Const.T_ARRAY, ""); - if ((dimensions < 1) || (dimensions > Const.MAX_BYTE)) { - throw new ClassGenException("Invalid number of dimensions: " + dimensions); - } - switch (type.getType()) { - case Const.T_ARRAY: - final ArrayType array = (ArrayType) type; - this.dimensions = dimensions + array.dimensions; - basicType = array.basicType; - break; - case Const.T_VOID: - throw new ClassGenException("Invalid type: void[]"); - default: // Basic type or reference - this.dimensions = dimensions; - basicType = type; - break; - } - final StringBuilder buf = new StringBuilder(); - for (int i = 0; i < this.dimensions; i++) { - buf.append('['); - } - buf.append(basicType.getSignature()); - super.setSignature(buf.toString()); - } - - - /** - * @return basic type of array, i.e., for int[][][] the basic type is int - */ - public Type getBasicType() { - return basicType; - } - - - /** - * @return element type of array, i.e., for int[][][] the element type is int[][] - */ - public Type getElementType() { - if (dimensions == 1) { - return basicType; - } - return new ArrayType(basicType, dimensions - 1); - } - - - /** @return number of dimensions of array - */ - public int getDimensions() { - return dimensions; - } - - - /** @return a hash code value for the object. - */ - @Override - public int hashCode() { - return basicType.hashCode() ^ dimensions; - } - - - /** @return true if both type objects refer to the same array type. - */ - @Override - public boolean equals( final Object _type ) { - if (_type instanceof ArrayType) { - final ArrayType array = (ArrayType) _type; - return (array.dimensions == dimensions) && array.basicType.equals(basicType); - } - return false; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/BALOAD.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/BALOAD.java deleted file mode 100644 index ed8febbb..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/BALOAD.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * BALOAD - Load byte or boolean from array - * 
Stack: ..., arrayref, index -> ..., value
- * - */ -public class BALOAD extends ArrayInstruction implements StackProducer { - - /** Load byte or boolean from array - */ - public BALOAD() { - super(org.apache.bcel.Const.BALOAD); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackProducer(this); - v.visitExceptionThrower(this); - v.visitTypedInstruction(this); - v.visitArrayInstruction(this); - v.visitBALOAD(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/BASTORE.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/BASTORE.java deleted file mode 100644 index defd4e48..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/BASTORE.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * BASTORE - Store into byte or boolean array - * 
Stack: ..., arrayref, index, value -> ...
- * - */ -public class BASTORE extends ArrayInstruction implements StackConsumer { - - /** Store byte or boolean into array - */ - public BASTORE() { - super(org.apache.bcel.Const.BASTORE); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackConsumer(this); - v.visitExceptionThrower(this); - v.visitTypedInstruction(this); - v.visitArrayInstruction(this); - v.visitBASTORE(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/BIPUSH.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/BIPUSH.java deleted file mode 100644 index 93dbb5d3..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/BIPUSH.java +++ /dev/null @@ -1,111 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.util.ByteSequence; - -/** - * BIPUSH - Push byte on stack - * - * 
Stack: ... -> ..., value
- * - */ -public class BIPUSH extends Instruction implements ConstantPushInstruction { - - private byte b; - - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - BIPUSH() { - } - - - /** Push byte on stack - */ - public BIPUSH(final byte b) { - super(org.apache.bcel.Const.BIPUSH, (short) 2); - this.b = b; - } - - - /** - * Dump instruction as byte code to stream out. - */ - @Override - public void dump( final DataOutputStream out ) throws IOException { - super.dump(out); - out.writeByte(b); - } - - - /** - * @return mnemonic for instruction - */ - @Override - public String toString( final boolean verbose ) { - return super.toString(verbose) + " " + b; - } - - - /** - * Read needed data (e.g. index) from file. - */ - @Override - protected void initFromFile( final ByteSequence bytes, final boolean wide ) throws IOException { - super.setLength(2); - b = bytes.readByte(); - } - - - @Override - public Number getValue() { - return Integer.valueOf(b); - } - - - /** @return Type.BYTE - */ - @Override - public Type getType( final ConstantPoolGen cp ) { - return Type.BYTE; - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitPushInstruction(this); - v.visitStackProducer(this); - v.visitTypedInstruction(this); - v.visitConstantPushInstruction(this); - v.visitBIPUSH(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/BREAKPOINT.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/BREAKPOINT.java deleted file mode 100644 index e6fbb0a2..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/BREAKPOINT.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * BREAKPOINT, JVM dependent, ignored by default - * - */ -public class BREAKPOINT extends Instruction { - - public BREAKPOINT() { - super(org.apache.bcel.Const.BREAKPOINT, (short) 1); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitBREAKPOINT(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/BasicType.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/BasicType.java deleted file mode 100644 index a9ee8bad..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/BasicType.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import org.apache.bcel.Const; - -/** - * Denotes basic type such as int. - * - */ -public final class BasicType extends Type { - - /** - * Constructor for basic types such as int, long, `void' - * - * @param type one of T_INT, T_BOOLEAN, ..., T_VOID - * @see Const - */ - BasicType(final byte type) { - super(type, Const.getShortTypeName(type)); - if ((type < Const.T_BOOLEAN) || (type > Const.T_VOID)) { - throw new ClassGenException("Invalid type: " + type); - } - } - - - // @since 6.0 no longer final - public static BasicType getType( final byte type ) { - switch (type) { - case Const.T_VOID: - return VOID; - case Const.T_BOOLEAN: - return BOOLEAN; - case Const.T_BYTE: - return BYTE; - case Const.T_SHORT: - return SHORT; - case Const.T_CHAR: - return CHAR; - case Const.T_INT: - return INT; - case Const.T_LONG: - return LONG; - case Const.T_DOUBLE: - return DOUBLE; - case Const.T_FLOAT: - return FLOAT; - default: - throw new ClassGenException("Invalid type: " + type); - } - } - - - /** @return a hash code value for the object. - */ - @Override - public int hashCode() { - return super.getType(); - } - - - /** @return true if both type objects refer to the same type - */ - @Override - public boolean equals( final Object _type ) { - return (_type instanceof BasicType) ? ((BasicType) _type).getType() == this.getType() : false; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/BranchHandle.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/BranchHandle.java deleted file mode 100644 index c03784cb..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/BranchHandle.java +++ /dev/null @@ -1,111 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * BranchHandle is returned by specialized InstructionList.append() whenever a - * BranchInstruction is appended. This is useful when the target of this - * instruction is not known at time of creation and must be set later - * via setTarget(). - * - * @see InstructionHandle - * @see Instruction - * @see InstructionList - */ -public final class BranchHandle extends InstructionHandle { - - // This is also a cache in case the InstructionHandle#swapInstruction() method is used - // See BCEL-273 - private BranchInstruction bi; // An alias in fact, but saves lots of casts - - - private BranchHandle(final BranchInstruction i) { - super(i); - bi = i; - } - - /** Factory method. - */ - static BranchHandle getBranchHandle( final BranchInstruction i ) { - return new BranchHandle(i); - } - - - /* Override InstructionHandle methods: delegate to branch instruction. - * Through this overriding all access to the private i_position field should - * be prevented. - */ - @Override - public int getPosition() { - return bi.getPosition(); - } - - - @Override - void setPosition( final int pos ) { - // Original code: i_position = bi.position = pos; - bi.setPosition(pos); - super.setPosition(pos); - } - - - @Override - protected int updatePosition( final int offset, final int max_offset ) { - final int x = bi.updatePosition(offset, max_offset); - super.setPosition(bi.getPosition()); - return x; - } - - - /** - * Pass new target to instruction. - */ - public void setTarget( final InstructionHandle ih ) { - bi.setTarget(ih); - } - - - /** - * Update target of instruction. - */ - public void updateTarget( final InstructionHandle old_ih, final InstructionHandle new_ih ) { - bi.updateTarget(old_ih, new_ih); - } - - - /** - * @return target of instruction. - */ - public InstructionHandle getTarget() { - return bi.getTarget(); - } - - - /** - * Set new contents. Old instruction is disposed and may not be used anymore. - */ - @Override // This is only done in order to apply the additional type check; could be merged with super impl. - public void setInstruction( final Instruction i ) { // TODO could be package-protected? - super.setInstruction(i); - if (!(i instanceof BranchInstruction)) { - throw new ClassGenException("Assigning " + i - + " to branch handle which is not a branch instruction"); - } - bi = (BranchInstruction) i; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/BranchInstruction.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/BranchInstruction.java deleted file mode 100644 index 1413ffff..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/BranchInstruction.java +++ /dev/null @@ -1,283 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.util.ByteSequence; - -/** - * Abstract super class for branching instructions like GOTO, IFEQ, etc.. - * Branch instructions may have a variable length, namely GOTO, JSR, - * LOOKUPSWITCH and TABLESWITCH. - * - * @see InstructionList - */ -public abstract class BranchInstruction extends Instruction implements InstructionTargeter { - - /** - * @deprecated (since 6.0) will be made private; do not access directly, use getter/setter - */ - @Deprecated - protected int index; // Branch target relative to this instruction - - /** - * @deprecated (since 6.0) will be made private; do not access directly, use getter/setter - */ - @Deprecated - protected InstructionHandle target; // Target object in instruction list - - /** - * @deprecated (since 6.0) will be made private; do not access directly, use getter/setter - */ - @Deprecated - protected int position; // Byte code offset - - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - BranchInstruction() { - } - - - /** Common super constructor - * @param opcode Instruction opcode - * @param target instruction to branch to - */ - protected BranchInstruction(final short opcode, final InstructionHandle target) { - super(opcode, (short) 3); - setTarget(target); - } - - - /** - * Dump instruction as byte code to stream out. - * @param out Output stream - */ - @Override - public void dump( final DataOutputStream out ) throws IOException { - out.writeByte(super.getOpcode()); - index = getTargetOffset(); - if (!isValidShort(index)) { - throw new ClassGenException("Branch target offset too large for short: " + index); - } - out.writeShort(index); // May be negative, i.e., point backwards - } - - - /** - * @param _target branch target - * @return the offset to `target' relative to this instruction - */ - protected int getTargetOffset( final InstructionHandle _target ) { - if (_target == null) { - throw new ClassGenException("Target of " + super.toString(true) - + " is invalid null handle"); - } - final int t = _target.getPosition(); - if (t < 0) { - throw new ClassGenException("Invalid branch target position offset for " - + super.toString(true) + ":" + t + ":" + _target); - } - return t - position; - } - - - /** - * @return the offset to this instruction's target - */ - protected int getTargetOffset() { - return getTargetOffset(target); - } - - - /** - * Called by InstructionList.setPositions when setting the position for every - * instruction. In the presence of variable length instructions `setPositions' - * performs multiple passes over the instruction list to calculate the - * correct (byte) positions and offsets by calling this function. - * - * @param offset additional offset caused by preceding (variable length) instructions - * @param max_offset the maximum offset that may be caused by these instructions - * @return additional offset caused by possible change of this instruction's length - */ - protected int updatePosition( final int offset, final int max_offset ) { - position += offset; - return 0; - } - - - /** - * Long output format: - * - * <position in byte code> - * <name of opcode> "["<opcode number>"]" - * "("<length of instruction>")" - * "<"<target instruction>">" "@"<branch target offset> - * - * @param verbose long/short format switch - * @return mnemonic for instruction - */ - @Override - public String toString( final boolean verbose ) { - final String s = super.toString(verbose); - String t = "null"; - if (verbose) { - if (target != null) { - if (target.getInstruction() == this) { - t = ""; - } else if (target.getInstruction() == null) { - t = ""; - } else { - // I'm more interested in the address of the target then - // the instruction located there. - //t = target.getInstruction().toString(false); // Avoid circles - t = "" + target.getPosition(); - } - } - } else { - if (target != null) { - index = target.getPosition(); - // index = getTargetOffset(); crashes if positions haven't been set - // t = "" + (index + position); - t = "" + index; - } - } - return s + " -> " + t; - } - - - /** - * Read needed data (e.g. index) from file. Conversion to a InstructionHandle - * is done in InstructionList(byte[]). - * - * @param bytes input stream - * @param wide wide prefix? - * @see InstructionList - */ - @Override - protected void initFromFile( final ByteSequence bytes, final boolean wide ) throws IOException { - super.setLength(3); - index = bytes.readShort(); - } - - - /** - * @return target offset in byte code - */ - public final int getIndex() { - return index; - } - - - /** - * @return target of branch instruction - */ - public InstructionHandle getTarget() { - return target; - } - - - /** - * Set branch target - * @param target branch target - */ - public void setTarget( final InstructionHandle target ) { - notifyTarget(this.target, target, this); - this.target = target; - } - - - /** - * Used by BranchInstruction, LocalVariableGen, CodeExceptionGen, LineNumberGen - */ - static void notifyTarget( final InstructionHandle old_ih, final InstructionHandle new_ih, - final InstructionTargeter t ) { - if (old_ih != null) { - old_ih.removeTargeter(t); - } - if (new_ih != null) { - new_ih.addTargeter(t); - } - } - - - /** - * @param old_ih old target - * @param new_ih new target - */ - @Override - public void updateTarget( final InstructionHandle old_ih, final InstructionHandle new_ih ) { - if (target == old_ih) { - setTarget(new_ih); - } else { - throw new ClassGenException("Not targeting " + old_ih + ", but " + target); - } - } - - - /** - * @return true, if ih is target of this instruction - */ - @Override - public boolean containsTarget( final InstructionHandle ih ) { - return target == ih; - } - - - /** - * Inform target that it's not targeted anymore. - */ - @Override - void dispose() { - setTarget(null); - index = -1; - position = -1; - } - - - /** - * @return the position - * @since 6.0 - */ - protected int getPosition() { - return position; - } - - - /** - * @param position the position to set - * @since 6.0 - */ - protected void setPosition(final int position) { - this.position = position; - } - - - /** - * @param index the index to set - * @since 6.0 - */ - protected void setIndex(final int index) { - this.index = index; - } - -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/CALOAD.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/CALOAD.java deleted file mode 100644 index 28caae3f..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/CALOAD.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * CALOAD - Load char from array - * 
Stack: ..., arrayref, index -> ..., value
- * - */ -public class CALOAD extends ArrayInstruction implements StackProducer { - - /** Load char from array - */ - public CALOAD() { - super(org.apache.bcel.Const.CALOAD); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackProducer(this); - v.visitExceptionThrower(this); - v.visitTypedInstruction(this); - v.visitArrayInstruction(this); - v.visitCALOAD(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/CASTORE.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/CASTORE.java deleted file mode 100644 index 314e56c4..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/CASTORE.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * CASTORE - Store into char array - * 
Stack: ..., arrayref, index, value -> ...
- * - */ -public class CASTORE extends ArrayInstruction implements StackConsumer { - - /** Store char into array - */ - public CASTORE() { - super(org.apache.bcel.Const.CASTORE); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackConsumer(this); - v.visitExceptionThrower(this); - v.visitTypedInstruction(this); - v.visitArrayInstruction(this); - v.visitCASTORE(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/CHECKCAST.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/CHECKCAST.java deleted file mode 100644 index 8dd7f75d..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/CHECKCAST.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import org.apache.bcel.ExceptionConst; - -/** - * CHECKCAST - Check whether object is of given type - * 
Stack: ..., objectref -> ..., objectref
- * - */ -public class CHECKCAST extends CPInstruction implements LoadClass, ExceptionThrower, StackProducer, - StackConsumer { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - CHECKCAST() { - } - - - /** Check whether object is of given type - * @param index index to class in constant pool - */ - public CHECKCAST(final int index) { - super(org.apache.bcel.Const.CHECKCAST, index); - } - - - /** @return exceptions this instruction may cause - */ - @Override - public Class[] getExceptions() { - return ExceptionConst.createExceptions(ExceptionConst.EXCS.EXCS_CLASS_AND_INTERFACE_RESOLUTION, - ExceptionConst.CLASS_CAST_EXCEPTION); - } - - - @Override - public ObjectType getLoadClassType( final ConstantPoolGen cpg ) { - Type t = getType(cpg); - if (t instanceof ArrayType) { - t = ((ArrayType) t).getBasicType(); - } - return (t instanceof ObjectType) ? (ObjectType) t : null; - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitLoadClass(this); - v.visitExceptionThrower(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitTypedInstruction(this); - v.visitCPInstruction(this); - v.visitCHECKCAST(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/CPInstruction.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/CPInstruction.java deleted file mode 100644 index 7b5e4dd7..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/CPInstruction.java +++ /dev/null @@ -1,149 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.classfile.Constant; -import org.apache.bcel.classfile.ConstantClass; -import org.apache.bcel.classfile.ConstantPool; -import org.apache.bcel.util.ByteSequence; - -/** - * Abstract super class for instructions that use an index into the - * constant pool such as LDC, INVOKEVIRTUAL, etc. - * - * @see ConstantPoolGen - * @see LDC - * @see INVOKEVIRTUAL - * - */ -public abstract class CPInstruction extends Instruction implements TypedInstruction, - IndexedInstruction { - - /** - * @deprecated (since 6.0) will be made private; do not access directly, use getter/setter - */ - @Deprecated - protected int index; // index to constant pool - - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - CPInstruction() { - } - - - /** - * @param index to constant pool - */ - protected CPInstruction(final short opcode, final int index) { - super(opcode, (short) 3); - setIndex(index); - } - - - /** - * Dump instruction as byte code to stream out. - * @param out Output stream - */ - @Override - public void dump( final DataOutputStream out ) throws IOException { - out.writeByte(super.getOpcode()); - out.writeShort(index); - } - - - /** - * Long output format: - * - * <name of opcode> "["<opcode number>"]" - * "("<length of instruction>")" "<"< constant pool index>">" - * - * @param verbose long/short format switch - * @return mnemonic for instruction - */ - @Override - public String toString( final boolean verbose ) { - return super.toString(verbose) + " " + index; - } - - - /** - * @return mnemonic for instruction with symbolic references resolved - */ - @Override - public String toString( final ConstantPool cp ) { - final Constant c = cp.getConstant(index); - String str = cp.constantToString(c); - if (c instanceof ConstantClass) { - str = str.replace('.', '/'); - } - return org.apache.bcel.Const.getOpcodeName(super.getOpcode()) + " " + str; - } - - - /** - * Read needed data (i.e., index) from file. - * @param bytes input stream - * @param wide wide prefix? - */ - @Override - protected void initFromFile( final ByteSequence bytes, final boolean wide ) throws IOException { - setIndex(bytes.readUnsignedShort()); - super.setLength(3); - } - - - /** - * @return index in constant pool referred by this instruction. - */ - @Override - public final int getIndex() { - return index; - } - - - /** - * Set the index to constant pool. - * @param index in constant pool. - */ - @Override - public void setIndex( final int index ) { // TODO could be package-protected? - if (index < 0) { - throw new ClassGenException("Negative index value: " + index); - } - this.index = index; - } - - - /** @return type related with this instruction. - */ - @Override - public Type getType( final ConstantPoolGen cpg ) { - final ConstantPool cp = cpg.getConstantPool(); - String name = cp.getConstantString(index, org.apache.bcel.Const.CONSTANT_Class); - if (!name.startsWith("[")) { - name = "L" + name + ";"; - } - return Type.getType(name); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ClassElementValueGen.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ClassElementValueGen.java deleted file mode 100644 index 60f76f66..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ClassElementValueGen.java +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.classfile.ClassElementValue; -import org.apache.bcel.classfile.ConstantUtf8; -import org.apache.bcel.classfile.ElementValue; - -/** - * @since 6.0 - */ -public class ClassElementValueGen extends ElementValueGen -{ - // For primitive types and string type, this points to the value entry in - // the cpool - // For 'class' this points to the class entry in the cpool - private int idx; - - protected ClassElementValueGen(final int typeIdx, final ConstantPoolGen cpool) - { - super(ElementValueGen.CLASS, cpool); - this.idx = typeIdx; - } - - public ClassElementValueGen(final ObjectType t, final ConstantPoolGen cpool) - { - super(ElementValueGen.CLASS, cpool); - // this.idx = cpool.addClass(t); - idx = cpool.addUtf8(t.getSignature()); - } - - /** - * Return immutable variant of this ClassElementValueGen - */ - @Override - public ElementValue getElementValue() - { - return new ClassElementValue(super.getElementValueType(), - idx, - getConstantPool().getConstantPool()); - } - - public ClassElementValueGen(final ClassElementValue value, final ConstantPoolGen cpool, - final boolean copyPoolEntries) - { - super(CLASS, cpool); - if (copyPoolEntries) - { - // idx = cpool.addClass(value.getClassString()); - idx = cpool.addUtf8(value.getClassString()); - } - else - { - idx = value.getIndex(); - } - } - - public int getIndex() - { - return idx; - } - - public String getClassString() - { - final ConstantUtf8 cu8 = (ConstantUtf8) getConstantPool().getConstant(idx); - return cu8.getBytes(); - // ConstantClass c = (ConstantClass)getConstantPool().getConstant(idx); - // ConstantUtf8 utf8 = - // (ConstantUtf8)getConstantPool().getConstant(c.getNameIndex()); - // return utf8.getBytes(); - } - - @Override - public String stringifyValue() - { - return getClassString(); - } - - @Override - public void dump(final DataOutputStream dos) throws IOException - { - dos.writeByte(super.getElementValueType()); // u1 kind of value - dos.writeShort(idx); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ClassGen.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ClassGen.java deleted file mode 100644 index 88844630..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ClassGen.java +++ /dev/null @@ -1,607 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; - -import org.apache.bcel.Const; -import org.apache.bcel.classfile.AccessFlags; -import org.apache.bcel.classfile.AnnotationEntry; -import org.apache.bcel.classfile.Annotations; -import org.apache.bcel.classfile.Attribute; -import org.apache.bcel.classfile.ConstantPool; -import org.apache.bcel.classfile.Field; -import org.apache.bcel.classfile.JavaClass; -import org.apache.bcel.classfile.Method; -import org.apache.bcel.classfile.RuntimeInvisibleAnnotations; -import org.apache.bcel.classfile.RuntimeVisibleAnnotations; -import org.apache.bcel.classfile.SourceFile; -import org.apache.bcel.util.BCELComparator; - -/** - * Template class for building up a java class. May be initialized with an - * existing java class (file). - * - * @see JavaClass - */ -public class ClassGen extends AccessFlags implements Cloneable { - - /* Corresponds to the fields found in a JavaClass object. - */ - private String className; - private String superClassName; - private final String fileName; - private int classNameIndex = -1; - private int superclass_name_index = -1; - private int major = Const.MAJOR_1_1; - private int minor = Const.MINOR_1_1; - private ConstantPoolGen cp; // Template for building up constant pool - // ArrayLists instead of arrays to gather fields, methods, etc. - private final List fieldList = new ArrayList<>(); - private final List methodList = new ArrayList<>(); - private final List attributeList = new ArrayList<>(); - private final List interfaceList = new ArrayList<>(); - private final List annotationList = new ArrayList<>(); - - private static BCELComparator bcelComparator = new BCELComparator() { - - @Override - public boolean equals( final Object o1, final Object o2 ) { - final ClassGen THIS = (ClassGen) o1; - final ClassGen THAT = (ClassGen) o2; - return Objects.equals(THIS.getClassName(), THAT.getClassName()); - } - - - @Override - public int hashCode( final Object o ) { - final ClassGen THIS = (ClassGen) o; - return THIS.getClassName().hashCode(); - } - }; - - - /** Convenience constructor to set up some important values initially. - * - * @param className fully qualified class name - * @param superClassName fully qualified superclass name - * @param fileName source file name - * @param accessFlags access qualifiers - * @param interfaces implemented interfaces - * @param cp constant pool to use - */ - public ClassGen(final String className, final String superClassName, final String fileName, final int accessFlags, - final String[] interfaces, final ConstantPoolGen cp) { - super(accessFlags); - this.className = className; - this.superClassName = superClassName; - this.fileName = fileName; - this.cp = cp; - // Put everything needed by default into the constant pool and the vectors - if (fileName != null) { - addAttribute(new SourceFile(cp.addUtf8("SourceFile"), 2, cp.addUtf8(fileName), cp - .getConstantPool())); - } - classNameIndex = cp.addClass(className); - superclass_name_index = cp.addClass(superClassName); - if (interfaces != null) { - for (final String interface1 : interfaces) { - addInterface(interface1); - } - } - } - - - /** Convenience constructor to set up some important values initially. - * - * @param className fully qualified class name - * @param superClassName fully qualified superclass name - * @param fileName source file name - * @param accessFlags access qualifiers - * @param interfaces implemented interfaces - */ - public ClassGen(final String className, final String superClassName, final String fileName, final int accessFlags, - final String[] interfaces) { - this(className, superClassName, fileName, accessFlags, interfaces, - new ConstantPoolGen()); - } - - - /** - * Initialize with existing class. - * @param clazz JavaClass object (e.g. read from file) - */ - public ClassGen(final JavaClass clazz) { - super(clazz.getAccessFlags()); - classNameIndex = clazz.getClassNameIndex(); - superclass_name_index = clazz.getSuperclassNameIndex(); - className = clazz.getClassName(); - superClassName = clazz.getSuperclassName(); - fileName = clazz.getSourceFileName(); - cp = new ConstantPoolGen(clazz.getConstantPool()); - major = clazz.getMajor(); - minor = clazz.getMinor(); - final Attribute[] attributes = clazz.getAttributes(); - // J5TODO: Could make unpacking lazy, done on first reference - final AnnotationEntryGen[] annotations = unpackAnnotations(attributes); - final Method[] methods = clazz.getMethods(); - final Field[] fields = clazz.getFields(); - final String[] interfaces = clazz.getInterfaceNames(); - for (final String interface1 : interfaces) { - addInterface(interface1); - } - for (final Attribute attribute : attributes) { - if (!(attribute instanceof Annotations)) { - addAttribute(attribute); - } - } - for (final AnnotationEntryGen annotation : annotations) { - addAnnotationEntry(annotation); - } - for (final Method method : methods) { - addMethod(method); - } - for (final Field field : fields) { - addField(field); - } - } - - /** - * Look for attributes representing annotations and unpack them. - */ - private AnnotationEntryGen[] unpackAnnotations(final Attribute[] attrs) - { - final List annotationGenObjs = new ArrayList<>(); - for (final Attribute attr : attrs) { - if (attr instanceof RuntimeVisibleAnnotations) - { - final RuntimeVisibleAnnotations rva = (RuntimeVisibleAnnotations) attr; - final AnnotationEntry[] annos = rva.getAnnotationEntries(); - for (final AnnotationEntry a : annos) { - annotationGenObjs.add(new AnnotationEntryGen(a, - getConstantPool(), false)); - } - } - else - if (attr instanceof RuntimeInvisibleAnnotations) - { - final RuntimeInvisibleAnnotations ria = (RuntimeInvisibleAnnotations) attr; - final AnnotationEntry[] annos = ria.getAnnotationEntries(); - for (final AnnotationEntry a : annos) { - annotationGenObjs.add(new AnnotationEntryGen(a, - getConstantPool(), false)); - } - } - } - return annotationGenObjs.toArray(new AnnotationEntryGen[annotationGenObjs.size()]); - } - - - /** - * @return the (finally) built up Java class object. - */ - public JavaClass getJavaClass() { - final int[] interfaces = getInterfaces(); - final Field[] fields = getFields(); - final Method[] methods = getMethods(); - Attribute[] attributes = null; - if (annotationList.isEmpty()) { - attributes = getAttributes(); - } else { - // TODO: Sometime later, trash any attributes called 'RuntimeVisibleAnnotations' or 'RuntimeInvisibleAnnotations' - final Attribute[] annAttributes = AnnotationEntryGen.getAnnotationAttributes(cp, getAnnotationEntries()); - attributes = new Attribute[attributeList.size()+annAttributes.length]; - attributeList.toArray(attributes); - System.arraycopy(annAttributes,0,attributes,attributeList.size(),annAttributes.length); - } - // Must be last since the above calls may still add something to it - final ConstantPool _cp = this.cp.getFinalConstantPool(); - return new JavaClass(classNameIndex, superclass_name_index, fileName, major, minor, - super.getAccessFlags(), _cp, interfaces, fields, methods, attributes); - } - - - /** - * Add an interface to this class, i.e., this class has to implement it. - * @param name interface to implement (fully qualified class name) - */ - public void addInterface( final String name ) { - interfaceList.add(name); - } - - - /** - * Remove an interface from this class. - * @param name interface to remove (fully qualified name) - */ - public void removeInterface( final String name ) { - interfaceList.remove(name); - } - - - /** - * @return major version number of class file - */ - public int getMajor() { - return major; - } - - - /** Set major version number of class file, default value is 45 (JDK 1.1) - * @param major major version number - */ - public void setMajor( final int major ) { // TODO could be package-protected - only called by test code - this.major = major; - } - - - /** Set minor version number of class file, default value is 3 (JDK 1.1) - * @param minor minor version number - */ - public void setMinor( final int minor ) { // TODO could be package-protected - only called by test code - this.minor = minor; - } - - /** - * @return minor version number of class file - */ - public int getMinor() { - return minor; - } - - - /** - * Add an attribute to this class. - * @param a attribute to add - */ - public void addAttribute( final Attribute a ) { - attributeList.add(a); - } - - public void addAnnotationEntry(final AnnotationEntryGen a) { - annotationList.add(a); - } - - - /** - * Add a method to this class. - * @param m method to add - */ - public void addMethod( final Method m ) { - methodList.add(m); - } - - - /** - * Convenience method. - * - * Add an empty constructor to this class that does nothing but calling super(). - * @param access_flags rights for constructor - */ - public void addEmptyConstructor( final int access_flags ) { - final InstructionList il = new InstructionList(); - il.append(InstructionConst.THIS); // Push `this' - il.append(new INVOKESPECIAL(cp.addMethodref(superClassName, "", "()V"))); - il.append(InstructionConst.RETURN); - final MethodGen mg = new MethodGen(access_flags, Type.VOID, Type.NO_ARGS, null, "", - className, il, cp); - mg.setMaxStack(1); - addMethod(mg.getMethod()); - } - - - /** - * Add a field to this class. - * @param f field to add - */ - public void addField( final Field f ) { - fieldList.add(f); - } - - - public boolean containsField( final Field f ) { - return fieldList.contains(f); - } - - - /** @return field object with given name, or null - */ - public Field containsField( final String name ) { - for (final Field f : fieldList) { - if (f.getName().equals(name)) { - return f; - } - } - return null; - } - - - /** @return method object with given name and signature, or null - */ - public Method containsMethod( final String name, final String signature ) { - for (final Method m : methodList) { - if (m.getName().equals(name) && m.getSignature().equals(signature)) { - return m; - } - } - return null; - } - - - /** - * Remove an attribute from this class. - * @param a attribute to remove - */ - public void removeAttribute( final Attribute a ) { - attributeList.remove(a); - } - - - /** - * Remove a method from this class. - * @param m method to remove - */ - public void removeMethod( final Method m ) { - methodList.remove(m); - } - - - /** Replace given method with new one. If the old one does not exist - * add the new_ method to the class anyway. - */ - public void replaceMethod( final Method old, final Method new_ ) { - if (new_ == null) { - throw new ClassGenException("Replacement method must not be null"); - } - final int i = methodList.indexOf(old); - if (i < 0) { - methodList.add(new_); - } else { - methodList.set(i, new_); - } - } - - - /** Replace given field with new one. If the old one does not exist - * add the new_ field to the class anyway. - */ - public void replaceField( final Field old, final Field new_ ) { - if (new_ == null) { - throw new ClassGenException("Replacement method must not be null"); - } - final int i = fieldList.indexOf(old); - if (i < 0) { - fieldList.add(new_); - } else { - fieldList.set(i, new_); - } - } - - - /** - * Remove a field to this class. - * @param f field to remove - */ - public void removeField( final Field f ) { - fieldList.remove(f); - } - - - public String getClassName() { - return className; - } - - - public String getSuperclassName() { - return superClassName; - } - - - public String getFileName() { - return fileName; - } - - - public void setClassName( final String name ) { - className = name.replace('/', '.'); - classNameIndex = cp.addClass(name); - } - - - public void setSuperclassName( final String name ) { - superClassName = name.replace('/', '.'); - superclass_name_index = cp.addClass(name); - } - - - public Method[] getMethods() { - return methodList.toArray(new Method[methodList.size()]); - } - - - public void setMethods( final Method[] methods ) { - methodList.clear(); - for (final Method method : methods) { - addMethod(method); - } - } - - - public void setMethodAt( final Method method, final int pos ) { - methodList.set(pos, method); - } - - - public Method getMethodAt( final int pos ) { - return methodList.get(pos); - } - - - public String[] getInterfaceNames() { - final int size = interfaceList.size(); - final String[] interfaces = new String[size]; - interfaceList.toArray(interfaces); - return interfaces; - } - - - public int[] getInterfaces() { - final int size = interfaceList.size(); - final int[] interfaces = new int[size]; - for (int i = 0; i < size; i++) { - interfaces[i] = cp.addClass(interfaceList.get(i)); - } - return interfaces; - } - - - public Field[] getFields() { - return fieldList.toArray(new Field[fieldList.size()]); - } - - - public Attribute[] getAttributes() { - return attributeList.toArray(new Attribute[attributeList.size()]); - } - - // J5TODO: Should we make calling unpackAnnotations() lazy and put it in here? - public AnnotationEntryGen[] getAnnotationEntries() { - return annotationList.toArray(new AnnotationEntryGen[annotationList.size()]); - } - - - public ConstantPoolGen getConstantPool() { - return cp; - } - - - public void setConstantPool( final ConstantPoolGen constant_pool ) { - cp = constant_pool; - } - - - public void setClassNameIndex( final int class_name_index ) { - this.classNameIndex = class_name_index; - className = cp.getConstantPool().getConstantString(class_name_index, - Const.CONSTANT_Class).replace('/', '.'); - } - - - public void setSuperclassNameIndex( final int superclass_name_index ) { - this.superclass_name_index = superclass_name_index; - superClassName = cp.getConstantPool().getConstantString(superclass_name_index, - Const.CONSTANT_Class).replace('/', '.'); - } - - - public int getSuperclassNameIndex() { - return superclass_name_index; - } - - - public int getClassNameIndex() { - return classNameIndex; - } - - private List observers; - - - /** Add observer for this object. - */ - public void addObserver( final ClassObserver o ) { - if (observers == null) { - observers = new ArrayList<>(); - } - observers.add(o); - } - - - /** Remove observer for this object. - */ - public void removeObserver( final ClassObserver o ) { - if (observers != null) { - observers.remove(o); - } - } - - - /** Call notify() method on all observers. This method is not called - * automatically whenever the state has changed, but has to be - * called by the user after he has finished editing the object. - */ - public void update() { - if (observers != null) { - for (final ClassObserver observer : observers) { - observer.notify(this); - } - } - } - - - @Override - public Object clone() { - try { - return super.clone(); - } catch (final CloneNotSupportedException e) { - throw new Error("Clone Not Supported"); // never happens - } - } - - - /** - * @return Comparison strategy object - */ - public static BCELComparator getComparator() { - return bcelComparator; - } - - - /** - * @param comparator Comparison strategy object - */ - public static void setComparator( final BCELComparator comparator ) { - bcelComparator = comparator; - } - - - /** - * Return value as defined by given BCELComparator strategy. - * By default two ClassGen objects are said to be equal when - * their class names are equal. - * - * @see java.lang.Object#equals(java.lang.Object) - */ - @Override - public boolean equals( final Object obj ) { - return bcelComparator.equals(this, obj); - } - - - /** - * Return value as defined by given BCELComparator strategy. - * By default return the hashcode of the class name. - * - * @see java.lang.Object#hashCode() - */ - @Override - public int hashCode() { - return bcelComparator.hashCode(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ClassGenException.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ClassGenException.java deleted file mode 100644 index 75dfc5e4..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ClassGenException.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * Thrown on internal errors. Extends RuntimeException so it hasn't to be declared - * in the throws clause every time. - * - */ -public class ClassGenException extends RuntimeException { - - private static final long serialVersionUID = 7247369755051242791L; - - public ClassGenException() { - super(); - } - - - public ClassGenException(final String s) { - super(s); - } - - public ClassGenException(final String s, final Throwable initCause) { - super(s, initCause); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ClassObserver.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ClassObserver.java deleted file mode 100644 index b6277ef7..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ClassObserver.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * Implement this interface if you're interested in changes to a ClassGen object - * and register yourself with addObserver(). - * - */ -public interface ClassObserver { - - void notify( ClassGen clazz ); -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/CodeExceptionGen.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/CodeExceptionGen.java deleted file mode 100644 index b2a1e24a..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/CodeExceptionGen.java +++ /dev/null @@ -1,186 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import org.apache.bcel.classfile.CodeException; - -/** - * This class represents an exception handler, i.e., specifies the region where - * a handler is active and an instruction where the actual handling is done. - * pool as parameters. Opposed to the JVM specification the end of the handled - * region is set to be inclusive, i.e. all instructions between start and end - * are protected including the start and end instructions (handles) themselves. - * The end of the region is automatically mapped to be exclusive when calling - * getCodeException(), i.e., there is no difference semantically. - * - * @see MethodGen - * @see CodeException - * @see InstructionHandle - */ -public final class CodeExceptionGen implements InstructionTargeter, Cloneable { - - private InstructionHandle startPc; - private InstructionHandle endPc; - private InstructionHandle handlerPc; - private ObjectType catchType; - - - /** - * Add an exception handler, i.e., specify region where a handler is active and an - * instruction where the actual handling is done. - * - * @param startPc Start of handled region (inclusive) - * @param endPc End of handled region (inclusive) - * @param handlerPc Where handling is done - * @param catchType which exception is handled, null for ANY - */ - public CodeExceptionGen(final InstructionHandle startPc, final InstructionHandle endPc, - final InstructionHandle handlerPc, final ObjectType catchType) { - setStartPC(startPc); - setEndPC(endPc); - setHandlerPC(handlerPc); - this.catchType = catchType; - } - - - /** - * Get CodeException object.
- * - * This relies on that the instruction list has already been dumped - * to byte code or or that the `setPositions' methods has been - * called for the instruction list. - * - * @param cp constant pool - */ - public CodeException getCodeException( final ConstantPoolGen cp ) { - return new CodeException(startPc.getPosition(), endPc.getPosition() - + endPc.getInstruction().getLength(), handlerPc.getPosition(), - (catchType == null) ? 0 : cp.addClass(catchType)); - } - - - /* Set start of handler - * @param startPc Start of handled region (inclusive) - */ - public void setStartPC( final InstructionHandle start_pc ) { // TODO could be package-protected? - BranchInstruction.notifyTarget(this.startPc, start_pc, this); - this.startPc = start_pc; - } - - - /* Set end of handler - * @param endPc End of handled region (inclusive) - */ - public void setEndPC( final InstructionHandle end_pc ) { // TODO could be package-protected? - BranchInstruction.notifyTarget(this.endPc, end_pc, this); - this.endPc = end_pc; - } - - - /* Set handler code - * @param handlerPc Start of handler - */ - public void setHandlerPC( final InstructionHandle handler_pc ) { // TODO could be package-protected? - BranchInstruction.notifyTarget(this.handlerPc, handler_pc, this); - this.handlerPc = handler_pc; - } - - - /** - * @param old_ih old target, either start or end - * @param new_ih new target - */ - @Override - public void updateTarget( final InstructionHandle old_ih, final InstructionHandle new_ih ) { - boolean targeted = false; - if (startPc == old_ih) { - targeted = true; - setStartPC(new_ih); - } - if (endPc == old_ih) { - targeted = true; - setEndPC(new_ih); - } - if (handlerPc == old_ih) { - targeted = true; - setHandlerPC(new_ih); - } - if (!targeted) { - throw new ClassGenException("Not targeting " + old_ih + ", but {" + startPc + ", " - + endPc + ", " + handlerPc + "}"); - } - } - - - /** - * @return true, if ih is target of this handler - */ - @Override - public boolean containsTarget( final InstructionHandle ih ) { - return (startPc == ih) || (endPc == ih) || (handlerPc == ih); - } - - - /** Sets the type of the Exception to catch. Set 'null' for ANY. */ - public void setCatchType( final ObjectType catchType ) { - this.catchType = catchType; - } - - - /** Gets the type of the Exception to catch, 'null' for ANY. */ - public ObjectType getCatchType() { - return catchType; - } - - - /** @return start of handled region (inclusive) - */ - public InstructionHandle getStartPC() { - return startPc; - } - - - /** @return end of handled region (inclusive) - */ - public InstructionHandle getEndPC() { - return endPc; - } - - - /** @return start of handler - */ - public InstructionHandle getHandlerPC() { - return handlerPc; - } - - - @Override - public String toString() { - return "CodeExceptionGen(" + startPc + ", " + endPc + ", " + handlerPc + ")"; - } - - - @Override - public Object clone() { - try { - return super.clone(); - } catch (final CloneNotSupportedException e) { - throw new Error("Clone Not Supported"); // never happens - } - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/CompoundInstruction.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/CompoundInstruction.java deleted file mode 100644 index a2b92eaa..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/CompoundInstruction.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * Wrapper class for `compound' operations, virtual instructions that - * don't exist as byte code, but give a useful meaning. For example, - * the (virtual) PUSH instruction takes an arbitray argument and produces the - * appropiate code at dump time (ICONST, LDC, BIPUSH, ...). Also you can use the - * SWITCH instruction as a useful template for either LOOKUPSWITCH or - * TABLESWITCH. - * - * The interface provides the possibilty for the user to write - * `templates' or `macros' for such reuseable code patterns. - * - * @see PUSH - * @see SWITCH - */ -public interface CompoundInstruction { - - InstructionList getInstructionList(); -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ConstantPoolGen.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ConstantPoolGen.java deleted file mode 100644 index 5a09e0d3..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ConstantPoolGen.java +++ /dev/null @@ -1,839 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import java.util.HashMap; -import java.util.Map; - -import org.apache.bcel.Const; -import org.apache.bcel.classfile.Constant; -import org.apache.bcel.classfile.ConstantCP; -import org.apache.bcel.classfile.ConstantClass; -import org.apache.bcel.classfile.ConstantDouble; -import org.apache.bcel.classfile.ConstantFieldref; -import org.apache.bcel.classfile.ConstantFloat; -import org.apache.bcel.classfile.ConstantInteger; -import org.apache.bcel.classfile.ConstantInterfaceMethodref; -import org.apache.bcel.classfile.ConstantInvokeDynamic; -import org.apache.bcel.classfile.ConstantLong; -import org.apache.bcel.classfile.ConstantMethodref; -import org.apache.bcel.classfile.ConstantNameAndType; -import org.apache.bcel.classfile.ConstantPool; -import org.apache.bcel.classfile.ConstantString; -import org.apache.bcel.classfile.ConstantUtf8; - -/** - * This class is used to build up a constant pool. The user adds - * constants via `addXXX' methods, `addString', `addClass', - * etc.. These methods return an index into the constant - * pool. Finally, `getFinalConstantPool()' returns the constant pool - * built up. Intermediate versions of the constant pool can be - * obtained with `getConstantPool()'. A constant pool has capacity for - * Constants.MAX_SHORT entries. Note that the first (0) is used by the - * JVM and that Double and Long constants need two slots. - * - * @see Constant - */ -public class ConstantPoolGen { - - private static final int DEFAULT_BUFFER_SIZE = 256; - - /** - * @deprecated (since 6.0) will be made private; do not access directly, use getter/setter - */ - @Deprecated - protected int size; - - /** - * @deprecated (since 6.0) will be made private; do not access directly, use getter/setter - */ - @Deprecated - protected Constant[] constants; - - /** - * @deprecated (since 6.0) will be made private; do not access directly, use getSize() - */ - @Deprecated - protected int index = 1; // First entry (0) used by JVM - - private static final String METHODREF_DELIM = ":"; - private static final String IMETHODREF_DELIM = "#"; - private static final String FIELDREF_DELIM = "&"; - private static final String NAT_DELIM = "%"; // Name and Type - - private static class Index { - - final int index; - - - Index(final int i) { - index = i; - } - } - - - /** - * Initialize with given array of constants. - * - * @param cs array of given constants, new ones will be appended - */ - public ConstantPoolGen(final Constant[] cs) { - final StringBuilder sb = new StringBuilder(DEFAULT_BUFFER_SIZE); - - size = Math.max(DEFAULT_BUFFER_SIZE, cs.length + 64); - constants = new Constant[size]; - - System.arraycopy(cs, 0, constants, 0, cs.length); - if (cs.length > 0) { - index = cs.length; - } - - - for (int i = 1; i < index; i++) { - final Constant c = constants[i]; - if (c instanceof ConstantString) { - final ConstantString s = (ConstantString) c; - final ConstantUtf8 u8 = (ConstantUtf8) constants[s.getStringIndex()]; - final String key = u8.getBytes(); - if (!stringTable.containsKey(key)) { - stringTable.put(key, new Index(i)); - } - } else if (c instanceof ConstantClass) { - final ConstantClass s = (ConstantClass) c; - final ConstantUtf8 u8 = (ConstantUtf8) constants[s.getNameIndex()]; - final String key = u8.getBytes(); - if (!classTable.containsKey(key)) { - classTable.put(key, new Index(i)); - } - } else if (c instanceof ConstantNameAndType) { - final ConstantNameAndType n = (ConstantNameAndType) c; - final ConstantUtf8 u8 = (ConstantUtf8) constants[n.getNameIndex()]; - final ConstantUtf8 u8_2 = (ConstantUtf8) constants[n.getSignatureIndex()]; - - sb.append(u8.getBytes()); - sb.append(NAT_DELIM); - sb.append(u8_2.getBytes()); - final String key = sb.toString(); - sb.delete(0, sb.length()); - - if (!natTable.containsKey(key)) { - natTable.put(key, new Index(i)); - } - } else if (c instanceof ConstantUtf8) { - final ConstantUtf8 u = (ConstantUtf8) c; - final String key = u.getBytes(); - if (!utf8Table.containsKey(key)) { - utf8Table.put(key, new Index(i)); - } - } else if (c instanceof ConstantCP) { - final ConstantCP m = (ConstantCP) c; - String class_name; - ConstantUtf8 u8; - - if (c instanceof ConstantInvokeDynamic) { - class_name = Integer.toString(((ConstantInvokeDynamic) m).getBootstrapMethodAttrIndex()); - // since name can't begin with digit, can use - // METHODREF_DELIM with out fear of duplicates. - } else { - final ConstantClass clazz = (ConstantClass) constants[m.getClassIndex()]; - u8 = (ConstantUtf8) constants[clazz.getNameIndex()]; - class_name = u8.getBytes().replace('/', '.'); - } - - final ConstantNameAndType n = (ConstantNameAndType) constants[m.getNameAndTypeIndex()]; - u8 = (ConstantUtf8) constants[n.getNameIndex()]; - final String method_name = u8.getBytes(); - u8 = (ConstantUtf8) constants[n.getSignatureIndex()]; - final String signature = u8.getBytes(); - - String delim = METHODREF_DELIM; - if (c instanceof ConstantInterfaceMethodref) { - delim = IMETHODREF_DELIM; - } else if (c instanceof ConstantFieldref) { - delim = FIELDREF_DELIM; - } - - sb.append(class_name); - sb.append(delim); - sb.append(method_name); - sb.append(delim); - sb.append(signature); - final String key = sb.toString(); - sb.delete(0, sb.length()); - - if (!cpTable.containsKey(key)) { - cpTable.put(key, new Index(i)); - } - } else if (c == null) { // entries may be null - // nothing to do - } else if (c instanceof ConstantInteger) { - // nothing to do - } else if (c instanceof ConstantLong) { - // nothing to do - } else if (c instanceof ConstantFloat) { - // nothing to do - } else if (c instanceof ConstantDouble) { - // nothing to do - } else if (c instanceof org.apache.bcel.classfile.ConstantMethodType) { - // TODO should this be handled somehow? - } else if (c instanceof org.apache.bcel.classfile.ConstantMethodHandle) { - // TODO should this be handled somehow? - } else if (c instanceof org.apache.bcel.classfile.ConstantModule) { - // TODO should this be handled somehow? - } else if (c instanceof org.apache.bcel.classfile.ConstantPackage) { - // TODO should this be handled somehow? - } else { - assert false : "Unexpected constant type: " + c.getClass().getName(); - } - } - } - - - /** - * Initialize with given constant pool. - */ - public ConstantPoolGen(final ConstantPool cp) { - this(cp.getConstantPool()); - } - - - /** - * Create empty constant pool. - */ - public ConstantPoolGen() { - size = DEFAULT_BUFFER_SIZE; - constants = new Constant[size]; - } - - - /** Resize internal array of constants. - */ - protected void adjustSize() { - if (index + 3 >= size) { - final Constant[] cs = constants; - size *= 2; - constants = new Constant[size]; - System.arraycopy(cs, 0, constants, 0, index); - } - } - - private final Map stringTable = new HashMap<>(); - - - /** - * Look for ConstantString in ConstantPool containing String `str'. - * - * @param str String to search for - * @return index on success, -1 otherwise - */ - public int lookupString( final String str ) { - final Index index = stringTable.get(str); - return (index != null) ? index.index : -1; - } - - - /** - * Add a new String constant to the ConstantPool, if it is not already in there. - * - * @param str String to add - * @return index of entry - */ - public int addString( final String str ) { - int ret; - if ((ret = lookupString(str)) != -1) { - return ret; // Already in CP - } - final int utf8 = addUtf8(str); - adjustSize(); - final ConstantString s = new ConstantString(utf8); - ret = index; - constants[index++] = s; - if (!stringTable.containsKey(str)) { - stringTable.put(str, new Index(ret)); - } - return ret; - } - - private final Map classTable = new HashMap<>(); - - - /** - * Look for ConstantClass in ConstantPool named `str'. - * - * @param str String to search for - * @return index on success, -1 otherwise - */ - public int lookupClass( final String str ) { - final Index index = classTable.get(str.replace('.', '/')); - return (index != null) ? index.index : -1; - } - - - private int addClass_( final String clazz ) { - int ret; - if ((ret = lookupClass(clazz)) != -1) { - return ret; // Already in CP - } - adjustSize(); - final ConstantClass c = new ConstantClass(addUtf8(clazz)); - ret = index; - constants[index++] = c; - if (!classTable.containsKey(clazz)) { - classTable.put(clazz, new Index(ret)); - } - return ret; - } - - - /** - * Add a new Class reference to the ConstantPool, if it is not already in there. - * - * @param str Class to add - * @return index of entry - */ - public int addClass( final String str ) { - return addClass_(str.replace('.', '/')); - } - - - /** - * Add a new Class reference to the ConstantPool for a given type. - * - * @param type Class to add - * @return index of entry - */ - public int addClass( final ObjectType type ) { - return addClass(type.getClassName()); - } - - - /** - * Add a reference to an array class (e.g. String[][]) as needed by MULTIANEWARRAY - * instruction, e.g. to the ConstantPool. - * - * @param type type of array class - * @return index of entry - */ - public int addArrayClass( final ArrayType type ) { - return addClass_(type.getSignature()); - } - - - /** - * Look for ConstantInteger in ConstantPool. - * - * @param n integer number to look for - * @return index on success, -1 otherwise - */ - public int lookupInteger( final int n ) { - for (int i = 1; i < index; i++) { - if (constants[i] instanceof ConstantInteger) { - final ConstantInteger c = (ConstantInteger) constants[i]; - if (c.getBytes() == n) { - return i; - } - } - } - return -1; - } - - - /** - * Add a new Integer constant to the ConstantPool, if it is not already in there. - * - * @param n integer number to add - * @return index of entry - */ - public int addInteger( final int n ) { - int ret; - if ((ret = lookupInteger(n)) != -1) { - return ret; // Already in CP - } - adjustSize(); - ret = index; - constants[index++] = new ConstantInteger(n); - return ret; - } - - - /** - * Look for ConstantFloat in ConstantPool. - * - * @param n Float number to look for - * @return index on success, -1 otherwise - */ - public int lookupFloat( final float n ) { - final int bits = Float.floatToIntBits(n); - for (int i = 1; i < index; i++) { - if (constants[i] instanceof ConstantFloat) { - final ConstantFloat c = (ConstantFloat) constants[i]; - if (Float.floatToIntBits(c.getBytes()) == bits) { - return i; - } - } - } - return -1; - } - - - /** - * Add a new Float constant to the ConstantPool, if it is not already in there. - * - * @param n Float number to add - * @return index of entry - */ - public int addFloat( final float n ) { - int ret; - if ((ret = lookupFloat(n)) != -1) { - return ret; // Already in CP - } - adjustSize(); - ret = index; - constants[index++] = new ConstantFloat(n); - return ret; - } - - private final Map utf8Table = new HashMap<>(); - - - /** - * Look for ConstantUtf8 in ConstantPool. - * - * @param n Utf8 string to look for - * @return index on success, -1 otherwise - */ - public int lookupUtf8( final String n ) { - final Index index = utf8Table.get(n); - return (index != null) ? index.index : -1; - } - - - /** - * Add a new Utf8 constant to the ConstantPool, if it is not already in there. - * - * @param n Utf8 string to add - * @return index of entry - */ - public int addUtf8( final String n ) { - int ret; - if ((ret = lookupUtf8(n)) != -1) { - return ret; // Already in CP - } - adjustSize(); - ret = index; - constants[index++] = new ConstantUtf8(n); - if (!utf8Table.containsKey(n)) { - utf8Table.put(n, new Index(ret)); - } - return ret; - } - - - /** - * Look for ConstantLong in ConstantPool. - * - * @param n Long number to look for - * @return index on success, -1 otherwise - */ - public int lookupLong( final long n ) { - for (int i = 1; i < index; i++) { - if (constants[i] instanceof ConstantLong) { - final ConstantLong c = (ConstantLong) constants[i]; - if (c.getBytes() == n) { - return i; - } - } - } - return -1; - } - - - /** - * Add a new long constant to the ConstantPool, if it is not already in there. - * - * @param n Long number to add - * @return index of entry - */ - public int addLong( final long n ) { - int ret; - if ((ret = lookupLong(n)) != -1) { - return ret; // Already in CP - } - adjustSize(); - ret = index; - constants[index] = new ConstantLong(n); - index += 2; // Wastes one entry according to spec - return ret; - } - - - /** - * Look for ConstantDouble in ConstantPool. - * - * @param n Double number to look for - * @return index on success, -1 otherwise - */ - public int lookupDouble( final double n ) { - final long bits = Double.doubleToLongBits(n); - for (int i = 1; i < index; i++) { - if (constants[i] instanceof ConstantDouble) { - final ConstantDouble c = (ConstantDouble) constants[i]; - if (Double.doubleToLongBits(c.getBytes()) == bits) { - return i; - } - } - } - return -1; - } - - - /** - * Add a new double constant to the ConstantPool, if it is not already in there. - * - * @param n Double number to add - * @return index of entry - */ - public int addDouble( final double n ) { - int ret; - if ((ret = lookupDouble(n)) != -1) { - return ret; // Already in CP - } - adjustSize(); - ret = index; - constants[index] = new ConstantDouble(n); - index += 2; // Wastes one entry according to spec - return ret; - } - - private final Map natTable = new HashMap<>(); - - - /** - * Look for ConstantNameAndType in ConstantPool. - * - * @param name of variable/method - * @param signature of variable/method - * @return index on success, -1 otherwise - */ - public int lookupNameAndType( final String name, final String signature ) { - final Index _index = natTable.get(name + NAT_DELIM + signature); - return (_index != null) ? _index.index : -1; - } - - - /** - * Add a new NameAndType constant to the ConstantPool if it is not already - * in there. - * - * @param name Name string to add - * @param signature signature string to add - * @return index of entry - */ - public int addNameAndType( final String name, final String signature ) { - int ret; - int name_index; - int signature_index; - if ((ret = lookupNameAndType(name, signature)) != -1) { - return ret; // Already in CP - } - adjustSize(); - name_index = addUtf8(name); - signature_index = addUtf8(signature); - ret = index; - constants[index++] = new ConstantNameAndType(name_index, signature_index); - final String key = name + NAT_DELIM + signature; - if (!natTable.containsKey(key)) { - natTable.put(key, new Index(ret)); - } - return ret; - } - - private final Map cpTable = new HashMap<>(); - - - /** - * Look for ConstantMethodref in ConstantPool. - * - * @param class_name Where to find method - * @param method_name Guess what - * @param signature return and argument types - * @return index on success, -1 otherwise - */ - public int lookupMethodref( final String class_name, final String method_name, final String signature ) { - final Index index = cpTable.get(class_name + METHODREF_DELIM + method_name - + METHODREF_DELIM + signature); - return (index != null) ? index.index : -1; - } - - - public int lookupMethodref( final MethodGen method ) { - return lookupMethodref(method.getClassName(), method.getName(), method.getSignature()); - } - - - /** - * Add a new Methodref constant to the ConstantPool, if it is not already - * in there. - * - * @param class_name class name string to add - * @param method_name method name string to add - * @param signature method signature string to add - * @return index of entry - */ - public int addMethodref( final String class_name, final String method_name, final String signature ) { - int ret; - int class_index; - int name_and_type_index; - if ((ret = lookupMethodref(class_name, method_name, signature)) != -1) { - return ret; // Already in CP - } - adjustSize(); - name_and_type_index = addNameAndType(method_name, signature); - class_index = addClass(class_name); - ret = index; - constants[index++] = new ConstantMethodref(class_index, name_and_type_index); - final String key = class_name + METHODREF_DELIM + method_name + METHODREF_DELIM + signature; - if (!cpTable.containsKey(key)) { - cpTable.put(key, new Index(ret)); - } - return ret; - } - - - public int addMethodref( final MethodGen method ) { - return addMethodref(method.getClassName(), method.getName(), method.getSignature()); - } - - - /** - * Look for ConstantInterfaceMethodref in ConstantPool. - * - * @param class_name Where to find method - * @param method_name Guess what - * @param signature return and argument types - * @return index on success, -1 otherwise - */ - public int lookupInterfaceMethodref( final String class_name, final String method_name, final String signature ) { - final Index index = cpTable.get(class_name + IMETHODREF_DELIM + method_name - + IMETHODREF_DELIM + signature); - return (index != null) ? index.index : -1; - } - - - public int lookupInterfaceMethodref( final MethodGen method ) { - return lookupInterfaceMethodref(method.getClassName(), method.getName(), method - .getSignature()); - } - - - /** - * Add a new InterfaceMethodref constant to the ConstantPool, if it is not already - * in there. - * - * @param class_name class name string to add - * @param method_name method name string to add - * @param signature signature string to add - * @return index of entry - */ - public int addInterfaceMethodref( final String class_name, final String method_name, final String signature ) { - int ret; - int class_index; - int name_and_type_index; - if ((ret = lookupInterfaceMethodref(class_name, method_name, signature)) != -1) { - return ret; // Already in CP - } - adjustSize(); - class_index = addClass(class_name); - name_and_type_index = addNameAndType(method_name, signature); - ret = index; - constants[index++] = new ConstantInterfaceMethodref(class_index, name_and_type_index); - final String key = class_name + IMETHODREF_DELIM + method_name + IMETHODREF_DELIM + signature; - if (!cpTable.containsKey(key)) { - cpTable.put(key, new Index(ret)); - } - return ret; - } - - - public int addInterfaceMethodref( final MethodGen method ) { - return addInterfaceMethodref(method.getClassName(), method.getName(), method.getSignature()); - } - - - /** - * Look for ConstantFieldref in ConstantPool. - * - * @param class_name Where to find method - * @param field_name Guess what - * @param signature return and argument types - * @return index on success, -1 otherwise - */ - public int lookupFieldref( final String class_name, final String field_name, final String signature ) { - final Index index = cpTable.get(class_name + FIELDREF_DELIM + field_name - + FIELDREF_DELIM + signature); - return (index != null) ? index.index : -1; - } - - - /** - * Add a new Fieldref constant to the ConstantPool, if it is not already - * in there. - * - * @param class_name class name string to add - * @param field_name field name string to add - * @param signature signature string to add - * @return index of entry - */ - public int addFieldref( final String class_name, final String field_name, final String signature ) { - int ret; - int class_index; - int name_and_type_index; - if ((ret = lookupFieldref(class_name, field_name, signature)) != -1) { - return ret; // Already in CP - } - adjustSize(); - class_index = addClass(class_name); - name_and_type_index = addNameAndType(field_name, signature); - ret = index; - constants[index++] = new ConstantFieldref(class_index, name_and_type_index); - final String key = class_name + FIELDREF_DELIM + field_name + FIELDREF_DELIM + signature; - if (!cpTable.containsKey(key)) { - cpTable.put(key, new Index(ret)); - } - return ret; - } - - - /** - * @param i index in constant pool - * @return constant pool entry at index i - */ - public Constant getConstant( final int i ) { - return constants[i]; - } - - - /** - * Use with care! - * - * @param i index in constant pool - * @param c new constant pool entry at index i - */ - public void setConstant( final int i, final Constant c ) { - constants[i] = c; - } - - - /** - * @return intermediate constant pool - */ - public ConstantPool getConstantPool() { - return new ConstantPool(constants); - } - - - /** - * @return current size of constant pool - */ - public int getSize() { - return index; - } - - - /** - * @return constant pool with proper length - */ - public ConstantPool getFinalConstantPool() { - final Constant[] cs = new Constant[index]; - System.arraycopy(constants, 0, cs, 0, index); - return new ConstantPool(cs); - } - - - /** - * @return String representation. - */ - @Override - public String toString() { - final StringBuilder buf = new StringBuilder(); - for (int i = 1; i < index; i++) { - buf.append(i).append(")").append(constants[i]).append("\n"); - } - return buf.toString(); - } - - - /** Import constant from another ConstantPool and return new index. - */ - public int addConstant( final Constant c, final ConstantPoolGen cp ) { - final Constant[] constants = cp.getConstantPool().getConstantPool(); - switch (c.getTag()) { - case Const.CONSTANT_String: { - final ConstantString s = (ConstantString) c; - final ConstantUtf8 u8 = (ConstantUtf8) constants[s.getStringIndex()]; - return addString(u8.getBytes()); - } - case Const.CONSTANT_Class: { - final ConstantClass s = (ConstantClass) c; - final ConstantUtf8 u8 = (ConstantUtf8) constants[s.getNameIndex()]; - return addClass(u8.getBytes()); - } - case Const.CONSTANT_NameAndType: { - final ConstantNameAndType n = (ConstantNameAndType) c; - final ConstantUtf8 u8 = (ConstantUtf8) constants[n.getNameIndex()]; - final ConstantUtf8 u8_2 = (ConstantUtf8) constants[n.getSignatureIndex()]; - return addNameAndType(u8.getBytes(), u8_2.getBytes()); - } - case Const.CONSTANT_Utf8: - return addUtf8(((ConstantUtf8) c).getBytes()); - case Const.CONSTANT_Double: - return addDouble(((ConstantDouble) c).getBytes()); - case Const.CONSTANT_Float: - return addFloat(((ConstantFloat) c).getBytes()); - case Const.CONSTANT_Long: - return addLong(((ConstantLong) c).getBytes()); - case Const.CONSTANT_Integer: - return addInteger(((ConstantInteger) c).getBytes()); - case Const.CONSTANT_InterfaceMethodref: - case Const.CONSTANT_Methodref: - case Const.CONSTANT_Fieldref: { - final ConstantCP m = (ConstantCP) c; - final ConstantClass clazz = (ConstantClass) constants[m.getClassIndex()]; - final ConstantNameAndType n = (ConstantNameAndType) constants[m.getNameAndTypeIndex()]; - ConstantUtf8 u8 = (ConstantUtf8) constants[clazz.getNameIndex()]; - final String class_name = u8.getBytes().replace('/', '.'); - u8 = (ConstantUtf8) constants[n.getNameIndex()]; - final String name = u8.getBytes(); - u8 = (ConstantUtf8) constants[n.getSignatureIndex()]; - final String signature = u8.getBytes(); - switch (c.getTag()) { - case Const.CONSTANT_InterfaceMethodref: - return addInterfaceMethodref(class_name, name, signature); - case Const.CONSTANT_Methodref: - return addMethodref(class_name, name, signature); - case Const.CONSTANT_Fieldref: - return addFieldref(class_name, name, signature); - default: // Never reached - throw new IllegalArgumentException("Unknown constant type " + c); - } - } - default: // Never reached - throw new IllegalArgumentException("Unknown constant type " + c); - } - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ConstantPushInstruction.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ConstantPushInstruction.java deleted file mode 100644 index 03ffba5f..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ConstantPushInstruction.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * Denotes a push instruction that produces a literal on the stack - * such as SIPUSH, BIPUSH, ICONST, etc. - * - - * @see ICONST - * @see SIPUSH - */ -public interface ConstantPushInstruction extends PushInstruction, TypedInstruction { - - Number getValue(); -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ConversionInstruction.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ConversionInstruction.java deleted file mode 100644 index 15d68233..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ConversionInstruction.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import org.apache.bcel.Const; - -/** - * Super class for the x2y family of instructions. - * - */ -public abstract class ConversionInstruction extends Instruction implements TypedInstruction, - StackProducer, StackConsumer { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - ConversionInstruction() { - } - - - /** - * @param opcode opcode of instruction - */ - protected ConversionInstruction(final short opcode) { - super(opcode, (short) 1); - } - - - /** @return type associated with the instruction - */ - @Override - public Type getType( final ConstantPoolGen cp ) { - final short _opcode = super.getOpcode(); - switch (_opcode) { - case Const.D2I: - case Const.F2I: - case Const.L2I: - return Type.INT; - case Const.D2F: - case Const.I2F: - case Const.L2F: - return Type.FLOAT; - case Const.D2L: - case Const.F2L: - case Const.I2L: - return Type.LONG; - case Const.F2D: - case Const.I2D: - case Const.L2D: - return Type.DOUBLE; - case Const.I2B: - return Type.BYTE; - case Const.I2C: - return Type.CHAR; - case Const.I2S: - return Type.SHORT; - default: // Never reached - throw new ClassGenException("Unknown type " + _opcode); - } - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/D2F.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/D2F.java deleted file mode 100644 index 0635186e..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/D2F.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * D2F - Convert double to float - * 
Stack: ..., value.word1, value.word2 -> ..., result
- * - */ -public class D2F extends ConversionInstruction { - - /** Convert double to float - */ - public D2F() { - super(org.apache.bcel.Const.D2F); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitConversionInstruction(this); - v.visitD2F(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/D2I.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/D2I.java deleted file mode 100644 index 22757fec..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/D2I.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * D2I - Convert double to int - * 
Stack: ..., value.word1, value.word2 -> ..., result
- * - */ -public class D2I extends ConversionInstruction { - - /** Convert double to int - */ - public D2I() { - super(org.apache.bcel.Const.D2I); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitConversionInstruction(this); - v.visitD2I(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/D2L.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/D2L.java deleted file mode 100644 index 89c3441c..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/D2L.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * D2L - Convert double to long - * 
Stack: ..., value.word1, value.word2 -> ..., result.word1, result.word2
- * - */ -public class D2L extends ConversionInstruction { - - /** Convert double to long - */ - public D2L() { - super(org.apache.bcel.Const.D2L); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitConversionInstruction(this); - v.visitD2L(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DADD.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DADD.java deleted file mode 100644 index 3522ed06..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DADD.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * DADD - Add doubles - * 
Stack: ..., value1.word1, value1.word2, value2.word1, value2.word2 ->
- * ..., result.word1, result1.word2 - * - */ -public class DADD extends ArithmeticInstruction { - - /** Add doubles - */ - public DADD() { - super(org.apache.bcel.Const.DADD); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitArithmeticInstruction(this); - v.visitDADD(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DALOAD.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DALOAD.java deleted file mode 100644 index 50f17ecc..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DALOAD.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * DALOAD - Load double from array - * 
Stack: ..., arrayref, index -> ..., result.word1, result.word2
- * - */ -public class DALOAD extends ArrayInstruction implements StackProducer { - - /** Load double from array - */ - public DALOAD() { - super(org.apache.bcel.Const.DALOAD); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackProducer(this); - v.visitExceptionThrower(this); - v.visitTypedInstruction(this); - v.visitArrayInstruction(this); - v.visitDALOAD(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DASTORE.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DASTORE.java deleted file mode 100644 index 1bb4f4c6..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DASTORE.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * DASTORE - Store into double array - * 
Stack: ..., arrayref, index, value.word1, value.word2 -> ...
- * - */ -public class DASTORE extends ArrayInstruction implements StackConsumer { - - /** Store double into array - */ - public DASTORE() { - super(org.apache.bcel.Const.DASTORE); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackConsumer(this); - v.visitExceptionThrower(this); - v.visitTypedInstruction(this); - v.visitArrayInstruction(this); - v.visitDASTORE(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DCMPG.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DCMPG.java deleted file mode 100644 index 8b1dc795..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DCMPG.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * DCMPG - Compare doubles: value1 > value2 - * 
Stack: ..., value1.word1, value1.word2, value2.word1, value2.word2 -> ..., result
- * - */ -public class DCMPG extends Instruction implements TypedInstruction, StackProducer, StackConsumer { - - public DCMPG() { - super(org.apache.bcel.Const.DCMPG, (short) 1); - } - - /** @return Type.DOUBLE - */ - @Override - public Type getType( final ConstantPoolGen cp ) { - return Type.DOUBLE; - } - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitDCMPG(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DCMPL.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DCMPL.java deleted file mode 100644 index 073274a2..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DCMPL.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * DCMPL - Compare doubles: value1 < value2 - * 
Stack: ..., value1.word1, value1.word2, value2.word1, value2.word2 -> ..., result
- * - */ -public class DCMPL extends Instruction implements TypedInstruction, StackProducer, StackConsumer { - - public DCMPL() { - super(org.apache.bcel.Const.DCMPL, (short) 1); - } - - /** @return Type.DOUBLE - */ - @Override - public Type getType( final ConstantPoolGen cp ) { - return Type.DOUBLE; - } - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitDCMPL(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DCONST.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DCONST.java deleted file mode 100644 index 3059e829..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DCONST.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * DCONST - Push 0.0 or 1.0, other values cause an exception - * - * 
Stack: ... -> ...,
- * - */ -public class DCONST extends Instruction implements ConstantPushInstruction { - - private double value; - - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - DCONST() { - } - - - public DCONST(final double f) { - super(org.apache.bcel.Const.DCONST_0, (short) 1); - if (f == 0.0) { - super.setOpcode(org.apache.bcel.Const.DCONST_0); - } else if (f == 1.0) { - super.setOpcode(org.apache.bcel.Const.DCONST_1); - } else { - throw new ClassGenException("DCONST can be used only for 0.0 and 1.0: " + f); - } - value = f; - } - - - @Override - public Number getValue() { - return new Double(value); - } - - - /** @return Type.DOUBLE - */ - @Override - public Type getType( final ConstantPoolGen cp ) { - return Type.DOUBLE; - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitPushInstruction(this); - v.visitStackProducer(this); - v.visitTypedInstruction(this); - v.visitConstantPushInstruction(this); - v.visitDCONST(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DDIV.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DDIV.java deleted file mode 100644 index 58457c2f..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DDIV.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * DDIV - Divide doubles - * 
Stack: ..., value1.word1, value1.word2, value2.word1, value2.word2 ->
- * ..., result.word1, result.word2 - * - */ -public class DDIV extends ArithmeticInstruction { - - /** Divide doubles - */ - public DDIV() { - super(org.apache.bcel.Const.DDIV); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitArithmeticInstruction(this); - v.visitDDIV(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DLOAD.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DLOAD.java deleted file mode 100644 index ed6fd2dd..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DLOAD.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * DLOAD - Load double from local variable - * 
Stack ... -> ..., result.word1, result.word2
- * - */ -public class DLOAD extends LoadInstruction { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - DLOAD() { - super(org.apache.bcel.Const.DLOAD, org.apache.bcel.Const.DLOAD_0); - } - - - /** Load double from local variable - * @param n index of local variable - */ - public DLOAD(final int n) { - super(org.apache.bcel.Const.DLOAD, org.apache.bcel.Const.DLOAD_0, n); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - super.accept(v); - v.visitDLOAD(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DMUL.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DMUL.java deleted file mode 100644 index e7c26be0..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DMUL.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * DMUL - Multiply doubles - * 
Stack: ..., value1.word1, value1.word2, value2.word1, value2.word2 ->
- * ..., result.word1, result.word2 - * - */ -public class DMUL extends ArithmeticInstruction { - - /** Multiply doubles - */ - public DMUL() { - super(org.apache.bcel.Const.DMUL); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitArithmeticInstruction(this); - v.visitDMUL(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DNEG.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DNEG.java deleted file mode 100644 index d5884739..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DNEG.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * DNEG - Negate double - * 
Stack: ..., value.word1, value.word2 -> ..., result.word1, result.word2
- * - */ -public class DNEG extends ArithmeticInstruction { - - public DNEG() { - super(org.apache.bcel.Const.DNEG); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitArithmeticInstruction(this); - v.visitDNEG(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DREM.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DREM.java deleted file mode 100644 index d64f039f..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DREM.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * DREM - Remainder of doubles - * 
Stack: ..., value1.word1, value1.word2, value2.word1, value2.word2 ->
- * ..., result.word1, result.word2 - * - */ -public class DREM extends ArithmeticInstruction { - - /** Remainder of doubles - */ - public DREM() { - super(org.apache.bcel.Const.DREM); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitArithmeticInstruction(this); - v.visitDREM(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DRETURN.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DRETURN.java deleted file mode 100644 index 4e82e34d..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DRETURN.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * DRETURN - Return double from method - * 
Stack: ..., value.word1, value.word2 -> <empty>
- * - */ -public class DRETURN extends ReturnInstruction { - - /** Return double from method - */ - public DRETURN() { - super(org.apache.bcel.Const.DRETURN); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitExceptionThrower(this); - v.visitTypedInstruction(this); - v.visitStackConsumer(this); - v.visitReturnInstruction(this); - v.visitDRETURN(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DSTORE.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DSTORE.java deleted file mode 100644 index 2d8d2470..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DSTORE.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * DSTORE - Store double into local variable - * 
Stack: ..., value.word1, value.word2 -> ...
- * - */ -public class DSTORE extends StoreInstruction { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - DSTORE() { - super(org.apache.bcel.Const.DSTORE, org.apache.bcel.Const.DSTORE_0); - } - - - /** Store double into local variable - * @param n index of local variable - */ - public DSTORE(final int n) { - super(org.apache.bcel.Const.DSTORE, org.apache.bcel.Const.DSTORE_0, n); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - super.accept(v); - v.visitDSTORE(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DSUB.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DSUB.java deleted file mode 100644 index b78fd970..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DSUB.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * DSUB - Substract doubles - * 
Stack: ..., value1.word1, value1.word2, value2.word1, value2.word2 ->
- * ..., result.word1, result.word2 - * - */ -public class DSUB extends ArithmeticInstruction { - - /** Substract doubles - */ - public DSUB() { - super(org.apache.bcel.Const.DSUB); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitArithmeticInstruction(this); - v.visitDSUB(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DUP.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DUP.java deleted file mode 100644 index 09d2fb03..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DUP.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * DUP - Duplicate top operand stack word - * 
Stack: ..., word -> ..., word, word
- * - */ -public class DUP extends StackInstruction implements PushInstruction { - - public DUP() { - super(org.apache.bcel.Const.DUP); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackProducer(this); - v.visitPushInstruction(this); - v.visitStackInstruction(this); - v.visitDUP(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DUP2.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DUP2.java deleted file mode 100644 index 4cee38d0..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DUP2.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * DUP2 - Duplicate two top operand stack words - * 
Stack: ..., word2, word1 -> ..., word2, word1, word2, word1
- * - */ -public class DUP2 extends StackInstruction implements PushInstruction { - - public DUP2() { - super(org.apache.bcel.Const.DUP2); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackProducer(this); - v.visitPushInstruction(this); - v.visitStackInstruction(this); - v.visitDUP2(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DUP2_X1.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DUP2_X1.java deleted file mode 100644 index 0f4f619d..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DUP2_X1.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * DUP2_X1 - Duplicate two top operand stack words and put three down - * 
Stack: ..., word3, word2, word1 -> ..., word2, word1, word3, word2, word1
- * - */ -public class DUP2_X1 extends StackInstruction { - - public DUP2_X1() { - super(org.apache.bcel.Const.DUP2_X1); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackInstruction(this); - v.visitDUP2_X1(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DUP2_X2.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DUP2_X2.java deleted file mode 100644 index 07a1697d..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DUP2_X2.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * DUP2_X2 - Duplicate two top operand stack words and put four down - * 
Stack: ..., word4, word3, word2, word1 -> ..., word2, word1, word4, word3, word2, word1
- * - */ -public class DUP2_X2 extends StackInstruction { - - public DUP2_X2() { - super(org.apache.bcel.Const.DUP2_X2); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackInstruction(this); - v.visitDUP2_X2(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DUP_X1.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DUP_X1.java deleted file mode 100644 index 2de80c3d..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DUP_X1.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * DUP_X1 - Duplicate top operand stack word and put two down - * 
Stack: ..., word2, word1 -> ..., word1, word2, word1
- * - */ -public class DUP_X1 extends StackInstruction { - - public DUP_X1() { - super(org.apache.bcel.Const.DUP_X1); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackInstruction(this); - v.visitDUP_X1(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DUP_X2.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DUP_X2.java deleted file mode 100644 index 0455eeef..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/DUP_X2.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * DUP_X2 - Duplicate top operand stack word and put three down - * 
Stack: ..., word3, word2, word1 -> ..., word1, word3, word2, word1
- * - */ -public class DUP_X2 extends StackInstruction { - - public DUP_X2() { - super(org.apache.bcel.Const.DUP_X2); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackInstruction(this); - v.visitDUP_X2(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ElementValueGen.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ElementValueGen.java deleted file mode 100644 index a10ee60f..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ElementValueGen.java +++ /dev/null @@ -1,194 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import java.io.DataInput; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.classfile.AnnotationElementValue; -import org.apache.bcel.classfile.AnnotationEntry; -import org.apache.bcel.classfile.ArrayElementValue; -import org.apache.bcel.classfile.ClassElementValue; -import org.apache.bcel.classfile.ElementValue; -import org.apache.bcel.classfile.EnumElementValue; -import org.apache.bcel.classfile.SimpleElementValue; - -/** - * @since 6.0 - */ -public abstract class ElementValueGen -{ - /** - * @deprecated (since 6.0) will be made private and final; do not access directly, use getter - */ - @Deprecated - protected int type; - - /** - * @deprecated (since 6.0) will be made private and final; do not access directly, use getter - */ - @Deprecated - protected ConstantPoolGen cpGen; - - protected ElementValueGen(final int type, final ConstantPoolGen cpGen) - { - this.type = type; - this.cpGen = cpGen; - } - - /** - * Subtypes return an immutable variant of the ElementValueGen - */ - public abstract ElementValue getElementValue(); - - public int getElementValueType() - { - return type; - } - - public abstract String stringifyValue(); - - public abstract void dump(DataOutputStream dos) throws IOException; - - public static final int STRING = 's'; - - public static final int ENUM_CONSTANT = 'e'; - - public static final int CLASS = 'c'; - - public static final int ANNOTATION = '@'; - - public static final int ARRAY = '['; - - public static final int PRIMITIVE_INT = 'I'; - - public static final int PRIMITIVE_BYTE = 'B'; - - public static final int PRIMITIVE_CHAR = 'C'; - - public static final int PRIMITIVE_DOUBLE = 'D'; - - public static final int PRIMITIVE_FLOAT = 'F'; - - public static final int PRIMITIVE_LONG = 'J'; - - public static final int PRIMITIVE_SHORT = 'S'; - - public static final int PRIMITIVE_BOOLEAN = 'Z'; - - public static ElementValueGen readElementValue(final DataInput dis, - final ConstantPoolGen cpGen) throws IOException - { - final int type = dis.readUnsignedByte(); - switch (type) - { - case 'B': // byte - return new SimpleElementValueGen(PRIMITIVE_BYTE, dis - .readUnsignedShort(), cpGen); - case 'C': // char - return new SimpleElementValueGen(PRIMITIVE_CHAR, dis - .readUnsignedShort(), cpGen); - case 'D': // double - return new SimpleElementValueGen(PRIMITIVE_DOUBLE, dis - .readUnsignedShort(), cpGen); - case 'F': // float - return new SimpleElementValueGen(PRIMITIVE_FLOAT, dis - .readUnsignedShort(), cpGen); - case 'I': // int - return new SimpleElementValueGen(PRIMITIVE_INT, dis - .readUnsignedShort(), cpGen); - case 'J': // long - return new SimpleElementValueGen(PRIMITIVE_LONG, dis - .readUnsignedShort(), cpGen); - case 'S': // short - return new SimpleElementValueGen(PRIMITIVE_SHORT, dis - .readUnsignedShort(), cpGen); - case 'Z': // boolean - return new SimpleElementValueGen(PRIMITIVE_BOOLEAN, dis - .readUnsignedShort(), cpGen); - case 's': // String - return new SimpleElementValueGen(STRING, dis.readUnsignedShort(), - cpGen); - case 'e': // Enum constant - return new EnumElementValueGen(dis.readUnsignedShort(), dis - .readUnsignedShort(), cpGen); - case 'c': // Class - return new ClassElementValueGen(dis.readUnsignedShort(), cpGen); - case '@': // Annotation - // TODO: isRuntimeVisible ?????????? - // FIXME - return new AnnotationElementValueGen(ANNOTATION, - new AnnotationEntryGen(AnnotationEntry.read(dis, cpGen - .getConstantPool(), true), cpGen, false), cpGen); - case '[': // Array - final int numArrayVals = dis.readUnsignedShort(); - final ElementValue[] evalues = new ElementValue[numArrayVals]; - for (int j = 0; j < numArrayVals; j++) - { - evalues[j] = ElementValue.readElementValue(dis, cpGen - .getConstantPool()); - } - return new ArrayElementValueGen(ARRAY, evalues, cpGen); - default: - throw new IllegalArgumentException("Unexpected element value kind in annotation: " + type); - } - } - - protected ConstantPoolGen getConstantPool() - { - return cpGen; - } - - /** - * Creates an (modifiable) ElementValueGen copy of an (immutable) - * ElementValue - constant pool is assumed correct. - */ - public static ElementValueGen copy(final ElementValue value, - final ConstantPoolGen cpool, final boolean copyPoolEntries) - { - switch (value.getElementValueType()) - { - case 'B': // byte - case 'C': // char - case 'D': // double - case 'F': // float - case 'I': // int - case 'J': // long - case 'S': // short - case 'Z': // boolean - case 's': // String - return new SimpleElementValueGen((SimpleElementValue) value, cpool, - copyPoolEntries); - case 'e': // Enum constant - return new EnumElementValueGen((EnumElementValue) value, cpool, - copyPoolEntries); - case '@': // Annotation - return new AnnotationElementValueGen( - (AnnotationElementValue) value, cpool, copyPoolEntries); - case '[': // Array - return new ArrayElementValueGen((ArrayElementValue) value, cpool, - copyPoolEntries); - case 'c': // Class - return new ClassElementValueGen((ClassElementValue) value, cpool, - copyPoolEntries); - default: - throw new UnsupportedOperationException("Not implemented yet! (" + value.getElementValueType() + ")"); - } - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ElementValuePairGen.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ElementValuePairGen.java deleted file mode 100644 index 3bb047b3..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ElementValuePairGen.java +++ /dev/null @@ -1,115 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.classfile.ConstantUtf8; -import org.apache.bcel.classfile.ElementValue; -import org.apache.bcel.classfile.ElementValuePair; - -/** - * @since 6.0 - */ -public class ElementValuePairGen -{ - private int nameIdx; - - private final ElementValueGen value; - - private final ConstantPoolGen constantPoolGen; - - public ElementValuePairGen(final ElementValuePair nvp, final ConstantPoolGen cpool, - final boolean copyPoolEntries) - { - this.constantPoolGen = cpool; - // J5ASSERT: - // Could assert nvp.getNameString() points to the same thing as - // constantPoolGen.getConstant(nvp.getNameIndex()) - // if - // (!nvp.getNameString().equals(((ConstantUtf8)constantPoolGen.getConstant(nvp.getNameIndex())).getBytes())) - // { - // throw new IllegalArgumentException("envp buggered"); - // } - if (copyPoolEntries) - { - nameIdx = cpool.addUtf8(nvp.getNameString()); - } - else - { - nameIdx = nvp.getNameIndex(); - } - value = ElementValueGen.copy(nvp.getValue(), cpool, copyPoolEntries); - } - - /** - * Retrieve an immutable version of this ElementNameValuePairGen - */ - public ElementValuePair getElementNameValuePair() - { - final ElementValue immutableValue = value.getElementValue(); - return new ElementValuePair(nameIdx, immutableValue, constantPoolGen - .getConstantPool()); - } - - protected ElementValuePairGen(final int idx, final ElementValueGen value, - final ConstantPoolGen cpool) - { - this.nameIdx = idx; - this.value = value; - this.constantPoolGen = cpool; - } - - public ElementValuePairGen(final String name, final ElementValueGen value, - final ConstantPoolGen cpool) - { - this.nameIdx = cpool.addUtf8(name); - this.value = value; - this.constantPoolGen = cpool; - } - - protected void dump(final DataOutputStream dos) throws IOException - { - dos.writeShort(nameIdx); // u2 name of the element - value.dump(dos); - } - - public int getNameIndex() - { - return nameIdx; - } - - public final String getNameString() - { - // ConstantString cu8 = (ConstantString)constantPoolGen.getConstant(nameIdx); - return ((ConstantUtf8) constantPoolGen.getConstant(nameIdx)).getBytes(); - } - - public final ElementValueGen getValue() - { - return value; - } - - @Override - public String toString() - { - return "ElementValuePair:[" + getNameString() + "=" - + value.stringifyValue() + "]"; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/EmptyVisitor.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/EmptyVisitor.java deleted file mode 100644 index e72185fb..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/EmptyVisitor.java +++ /dev/null @@ -1,931 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * Supplies empty method bodies to be overridden by subclasses. - * - */ -public abstract class EmptyVisitor implements Visitor { - - @Override - public void visitStackInstruction( final StackInstruction obj ) { - } - - - @Override - public void visitLocalVariableInstruction( final LocalVariableInstruction obj ) { - } - - - @Override - public void visitBranchInstruction( final BranchInstruction obj ) { - } - - - @Override - public void visitLoadClass( final LoadClass obj ) { - } - - - @Override - public void visitFieldInstruction( final FieldInstruction obj ) { - } - - - @Override - public void visitIfInstruction( final IfInstruction obj ) { - } - - - @Override - public void visitConversionInstruction( final ConversionInstruction obj ) { - } - - - @Override - public void visitPopInstruction( final PopInstruction obj ) { - } - - - @Override - public void visitJsrInstruction( final JsrInstruction obj ) { - } - - - @Override - public void visitGotoInstruction( final GotoInstruction obj ) { - } - - - @Override - public void visitStoreInstruction( final StoreInstruction obj ) { - } - - - @Override - public void visitTypedInstruction( final TypedInstruction obj ) { - } - - - @Override - public void visitSelect( final Select obj ) { - } - - - @Override - public void visitUnconditionalBranch( final UnconditionalBranch obj ) { - } - - - @Override - public void visitPushInstruction( final PushInstruction obj ) { - } - - - @Override - public void visitArithmeticInstruction( final ArithmeticInstruction obj ) { - } - - - @Override - public void visitCPInstruction( final CPInstruction obj ) { - } - - - @Override - public void visitInvokeInstruction( final InvokeInstruction obj ) { - } - - - @Override - public void visitArrayInstruction( final ArrayInstruction obj ) { - } - - - @Override - public void visitAllocationInstruction( final AllocationInstruction obj ) { - } - - - @Override - public void visitReturnInstruction( final ReturnInstruction obj ) { - } - - - @Override - public void visitFieldOrMethod( final FieldOrMethod obj ) { - } - - - @Override - public void visitConstantPushInstruction( final ConstantPushInstruction obj ) { - } - - - @Override - public void visitExceptionThrower( final ExceptionThrower obj ) { - } - - - @Override - public void visitLoadInstruction( final LoadInstruction obj ) { - } - - - @Override - public void visitVariableLengthInstruction( final VariableLengthInstruction obj ) { - } - - - @Override - public void visitStackProducer( final StackProducer obj ) { - } - - - @Override - public void visitStackConsumer( final StackConsumer obj ) { - } - - - @Override - public void visitACONST_NULL( final ACONST_NULL obj ) { - } - - - @Override - public void visitGETSTATIC( final GETSTATIC obj ) { - } - - - @Override - public void visitIF_ICMPLT( final IF_ICMPLT obj ) { - } - - - @Override - public void visitMONITOREXIT( final MONITOREXIT obj ) { - } - - - @Override - public void visitIFLT( final IFLT obj ) { - } - - - @Override - public void visitLSTORE( final LSTORE obj ) { - } - - - @Override - public void visitPOP2( final POP2 obj ) { - } - - - @Override - public void visitBASTORE( final BASTORE obj ) { - } - - - @Override - public void visitISTORE( final ISTORE obj ) { - } - - - @Override - public void visitCHECKCAST( final CHECKCAST obj ) { - } - - - @Override - public void visitFCMPG( final FCMPG obj ) { - } - - - @Override - public void visitI2F( final I2F obj ) { - } - - - @Override - public void visitATHROW( final ATHROW obj ) { - } - - - @Override - public void visitDCMPL( final DCMPL obj ) { - } - - - @Override - public void visitARRAYLENGTH( final ARRAYLENGTH obj ) { - } - - - @Override - public void visitDUP( final DUP obj ) { - } - - - @Override - public void visitINVOKESTATIC( final INVOKESTATIC obj ) { - } - - - @Override - public void visitLCONST( final LCONST obj ) { - } - - - @Override - public void visitDREM( final DREM obj ) { - } - - - @Override - public void visitIFGE( final IFGE obj ) { - } - - - @Override - public void visitCALOAD( final CALOAD obj ) { - } - - - @Override - public void visitLASTORE( final LASTORE obj ) { - } - - - @Override - public void visitI2D( final I2D obj ) { - } - - - @Override - public void visitDADD( final DADD obj ) { - } - - - @Override - public void visitINVOKESPECIAL( final INVOKESPECIAL obj ) { - } - - - @Override - public void visitIAND( final IAND obj ) { - } - - - @Override - public void visitPUTFIELD( final PUTFIELD obj ) { - } - - - @Override - public void visitILOAD( final ILOAD obj ) { - } - - - @Override - public void visitDLOAD( final DLOAD obj ) { - } - - - @Override - public void visitDCONST( final DCONST obj ) { - } - - - @Override - public void visitNEW( final NEW obj ) { - } - - - @Override - public void visitIFNULL( final IFNULL obj ) { - } - - - @Override - public void visitLSUB( final LSUB obj ) { - } - - - @Override - public void visitL2I( final L2I obj ) { - } - - - @Override - public void visitISHR( final ISHR obj ) { - } - - - @Override - public void visitTABLESWITCH( final TABLESWITCH obj ) { - } - - - @Override - public void visitIINC( final IINC obj ) { - } - - - @Override - public void visitDRETURN( final DRETURN obj ) { - } - - - @Override - public void visitFSTORE( final FSTORE obj ) { - } - - - @Override - public void visitDASTORE( final DASTORE obj ) { - } - - - @Override - public void visitIALOAD( final IALOAD obj ) { - } - - - @Override - public void visitDDIV( final DDIV obj ) { - } - - - @Override - public void visitIF_ICMPGE( final IF_ICMPGE obj ) { - } - - - @Override - public void visitLAND( final LAND obj ) { - } - - - @Override - public void visitIDIV( final IDIV obj ) { - } - - - @Override - public void visitLOR( final LOR obj ) { - } - - - @Override - public void visitCASTORE( final CASTORE obj ) { - } - - - @Override - public void visitFREM( final FREM obj ) { - } - - - @Override - public void visitLDC( final LDC obj ) { - } - - - @Override - public void visitBIPUSH( final BIPUSH obj ) { - } - - - @Override - public void visitDSTORE( final DSTORE obj ) { - } - - - @Override - public void visitF2L( final F2L obj ) { - } - - - @Override - public void visitFMUL( final FMUL obj ) { - } - - - @Override - public void visitLLOAD( final LLOAD obj ) { - } - - - @Override - public void visitJSR( final JSR obj ) { - } - - - @Override - public void visitFSUB( final FSUB obj ) { - } - - - @Override - public void visitSASTORE( final SASTORE obj ) { - } - - - @Override - public void visitALOAD( final ALOAD obj ) { - } - - - @Override - public void visitDUP2_X2( final DUP2_X2 obj ) { - } - - - @Override - public void visitRETURN( final RETURN obj ) { - } - - - @Override - public void visitDALOAD( final DALOAD obj ) { - } - - - @Override - public void visitSIPUSH( final SIPUSH obj ) { - } - - - @Override - public void visitDSUB( final DSUB obj ) { - } - - - @Override - public void visitL2F( final L2F obj ) { - } - - - @Override - public void visitIF_ICMPGT( final IF_ICMPGT obj ) { - } - - - @Override - public void visitF2D( final F2D obj ) { - } - - - @Override - public void visitI2L( final I2L obj ) { - } - - - @Override - public void visitIF_ACMPNE( final IF_ACMPNE obj ) { - } - - - @Override - public void visitPOP( final POP obj ) { - } - - - @Override - public void visitI2S( final I2S obj ) { - } - - - @Override - public void visitIFEQ( final IFEQ obj ) { - } - - - @Override - public void visitSWAP( final SWAP obj ) { - } - - - @Override - public void visitIOR( final IOR obj ) { - } - - - @Override - public void visitIREM( final IREM obj ) { - } - - - @Override - public void visitIASTORE( final IASTORE obj ) { - } - - - @Override - public void visitNEWARRAY( final NEWARRAY obj ) { - } - - - @Override - public void visitINVOKEINTERFACE( final INVOKEINTERFACE obj ) { - } - - - @Override - public void visitINEG( final INEG obj ) { - } - - - @Override - public void visitLCMP( final LCMP obj ) { - } - - - @Override - public void visitJSR_W( final JSR_W obj ) { - } - - - @Override - public void visitMULTIANEWARRAY( final MULTIANEWARRAY obj ) { - } - - - @Override - public void visitDUP_X2( final DUP_X2 obj ) { - } - - - @Override - public void visitSALOAD( final SALOAD obj ) { - } - - - @Override - public void visitIFNONNULL( final IFNONNULL obj ) { - } - - - @Override - public void visitDMUL( final DMUL obj ) { - } - - - @Override - public void visitIFNE( final IFNE obj ) { - } - - - @Override - public void visitIF_ICMPLE( final IF_ICMPLE obj ) { - } - - - @Override - public void visitLDC2_W( final LDC2_W obj ) { - } - - - @Override - public void visitGETFIELD( final GETFIELD obj ) { - } - - - @Override - public void visitLADD( final LADD obj ) { - } - - - @Override - public void visitNOP( final NOP obj ) { - } - - - @Override - public void visitFALOAD( final FALOAD obj ) { - } - - - @Override - public void visitINSTANCEOF( final INSTANCEOF obj ) { - } - - - @Override - public void visitIFLE( final IFLE obj ) { - } - - - @Override - public void visitLXOR( final LXOR obj ) { - } - - - @Override - public void visitLRETURN( final LRETURN obj ) { - } - - - @Override - public void visitFCONST( final FCONST obj ) { - } - - - @Override - public void visitIUSHR( final IUSHR obj ) { - } - - - @Override - public void visitBALOAD( final BALOAD obj ) { - } - - - @Override - public void visitDUP2( final DUP2 obj ) { - } - - - @Override - public void visitIF_ACMPEQ( final IF_ACMPEQ obj ) { - } - - - @Override - public void visitIMPDEP1( final IMPDEP1 obj ) { - } - - - @Override - public void visitMONITORENTER( final MONITORENTER obj ) { - } - - - @Override - public void visitLSHL( final LSHL obj ) { - } - - - @Override - public void visitDCMPG( final DCMPG obj ) { - } - - - @Override - public void visitD2L( final D2L obj ) { - } - - - @Override - public void visitIMPDEP2( final IMPDEP2 obj ) { - } - - - @Override - public void visitL2D( final L2D obj ) { - } - - - @Override - public void visitRET( final RET obj ) { - } - - - @Override - public void visitIFGT( final IFGT obj ) { - } - - - @Override - public void visitIXOR( final IXOR obj ) { - } - - - @Override - public void visitINVOKEVIRTUAL( final INVOKEVIRTUAL obj ) { - } - - - @Override - public void visitFASTORE( final FASTORE obj ) { - } - - - @Override - public void visitIRETURN( final IRETURN obj ) { - } - - - @Override - public void visitIF_ICMPNE( final IF_ICMPNE obj ) { - } - - - @Override - public void visitFLOAD( final FLOAD obj ) { - } - - - @Override - public void visitLDIV( final LDIV obj ) { - } - - - @Override - public void visitPUTSTATIC( final PUTSTATIC obj ) { - } - - - @Override - public void visitAALOAD( final AALOAD obj ) { - } - - - @Override - public void visitD2I( final D2I obj ) { - } - - - @Override - public void visitIF_ICMPEQ( final IF_ICMPEQ obj ) { - } - - - @Override - public void visitAASTORE( final AASTORE obj ) { - } - - - @Override - public void visitARETURN( final ARETURN obj ) { - } - - - @Override - public void visitDUP2_X1( final DUP2_X1 obj ) { - } - - - @Override - public void visitFNEG( final FNEG obj ) { - } - - - @Override - public void visitGOTO_W( final GOTO_W obj ) { - } - - - @Override - public void visitD2F( final D2F obj ) { - } - - - @Override - public void visitGOTO( final GOTO obj ) { - } - - - @Override - public void visitISUB( final ISUB obj ) { - } - - - @Override - public void visitF2I( final F2I obj ) { - } - - - @Override - public void visitDNEG( final DNEG obj ) { - } - - - @Override - public void visitICONST( final ICONST obj ) { - } - - - @Override - public void visitFDIV( final FDIV obj ) { - } - - - @Override - public void visitI2B( final I2B obj ) { - } - - - @Override - public void visitLNEG( final LNEG obj ) { - } - - - @Override - public void visitLREM( final LREM obj ) { - } - - - @Override - public void visitIMUL( final IMUL obj ) { - } - - - @Override - public void visitIADD( final IADD obj ) { - } - - - @Override - public void visitLSHR( final LSHR obj ) { - } - - - @Override - public void visitLOOKUPSWITCH( final LOOKUPSWITCH obj ) { - } - - - @Override - public void visitDUP_X1( final DUP_X1 obj ) { - } - - - @Override - public void visitFCMPL( final FCMPL obj ) { - } - - - @Override - public void visitI2C( final I2C obj ) { - } - - - @Override - public void visitLMUL( final LMUL obj ) { - } - - - @Override - public void visitLUSHR( final LUSHR obj ) { - } - - - @Override - public void visitISHL( final ISHL obj ) { - } - - - @Override - public void visitLALOAD( final LALOAD obj ) { - } - - - @Override - public void visitASTORE( final ASTORE obj ) { - } - - - @Override - public void visitANEWARRAY( final ANEWARRAY obj ) { - } - - - @Override - public void visitFRETURN( final FRETURN obj ) { - } - - - @Override - public void visitFADD( final FADD obj ) { - } - - - @Override - public void visitBREAKPOINT( final BREAKPOINT obj ) { - } - - /** - * @since 6.0 - */ - @Override - public void visitINVOKEDYNAMIC(final INVOKEDYNAMIC obj) { - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/EnumElementValueGen.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/EnumElementValueGen.java deleted file mode 100644 index 122f4370..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/EnumElementValueGen.java +++ /dev/null @@ -1,142 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.classfile.ConstantUtf8; -import org.apache.bcel.classfile.ElementValue; -import org.apache.bcel.classfile.EnumElementValue; - -/** - * @since 6.0 - */ -public class EnumElementValueGen extends ElementValueGen -{ - // For enum types, these two indices point to the type and value - private int typeIdx; - - private int valueIdx; - - /** - * This ctor assumes the constant pool already contains the right type and - * value - as indicated by typeIdx and valueIdx. This ctor is used for - * deserialization - */ - protected EnumElementValueGen(final int typeIdx, final int valueIdx, - final ConstantPoolGen cpool) - { - super(ElementValueGen.ENUM_CONSTANT, cpool); - if (super.getElementValueType() != ENUM_CONSTANT) { - throw new IllegalArgumentException( - "Only element values of type enum can be built with this ctor - type specified: " + super.getElementValueType()); - } - this.typeIdx = typeIdx; - this.valueIdx = valueIdx; - } - - /** - * Return immutable variant of this EnumElementValue - */ - @Override - public ElementValue getElementValue() - { - System.err.println("Duplicating value: " + getEnumTypeString() + ":" - + getEnumValueString()); - return new EnumElementValue(super.getElementValueType(), typeIdx, valueIdx, - getConstantPool().getConstantPool()); - } - - public EnumElementValueGen(final ObjectType t, final String value, final ConstantPoolGen cpool) - { - super(ElementValueGen.ENUM_CONSTANT, cpool); - typeIdx = cpool.addUtf8(t.getSignature());// was addClass(t); - valueIdx = cpool.addUtf8(value);// was addString(value); - } - - public EnumElementValueGen(final EnumElementValue value, final ConstantPoolGen cpool, - final boolean copyPoolEntries) - { - super(ENUM_CONSTANT, cpool); - if (copyPoolEntries) - { - typeIdx = cpool.addUtf8(value.getEnumTypeString());// was - // addClass(value.getEnumTypeString()); - valueIdx = cpool.addUtf8(value.getEnumValueString()); // was - // addString(value.getEnumValueString()); - } - else - { - typeIdx = value.getTypeIndex(); - valueIdx = value.getValueIndex(); - } - } - - @Override - public void dump(final DataOutputStream dos) throws IOException - { - dos.writeByte(super.getElementValueType()); // u1 type of value (ENUM_CONSTANT == 'e') - dos.writeShort(typeIdx); // u2 - dos.writeShort(valueIdx); // u2 - } - - @Override - public String stringifyValue() - { - final ConstantUtf8 cu8 = (ConstantUtf8) getConstantPool().getConstant(valueIdx); - return cu8.getBytes(); - // ConstantString cu8 = - // (ConstantString)getConstantPool().getConstant(valueIdx); - // return - // ((ConstantUtf8)getConstantPool().getConstant(cu8.getStringIndex())).getBytes(); - } - - // BCELBUG: Should we need to call utility.signatureToString() on the output - // here? - public String getEnumTypeString() - { - // Constant cc = getConstantPool().getConstant(typeIdx); - // ConstantClass cu8 = - // (ConstantClass)getConstantPool().getConstant(typeIdx); - // return - // ((ConstantUtf8)getConstantPool().getConstant(cu8.getNameIndex())).getBytes(); - return ((ConstantUtf8) getConstantPool().getConstant(typeIdx)) - .getBytes(); - // return Utility.signatureToString(cu8.getBytes()); - } - - public String getEnumValueString() - { - return ((ConstantUtf8) getConstantPool().getConstant(valueIdx)).getBytes(); - // ConstantString cu8 = - // (ConstantString)getConstantPool().getConstant(valueIdx); - // return - // ((ConstantUtf8)getConstantPool().getConstant(cu8.getStringIndex())).getBytes(); - } - - public int getValueIndex() - { - return valueIdx; - } - - public int getTypeIndex() - { - return typeIdx; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ExceptionThrower.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ExceptionThrower.java deleted file mode 100644 index af285ab4..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ExceptionThrower.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * Denote an instruction that may throw a run-time or a linking - * exception (or both) during execution. This is not quite the truth - * as such; because all instructions may throw an - * java.lang.VirtualMachineError. These exceptions are omitted. - * - * The Lava Language Specification specifies exactly which - * RUN-TIME and which LINKING exceptions each - * instruction may throw which is reflected by the implementers. Due - * to the structure of the JVM specification, it may be possible that - * an Instruction implementing this interface returns a Class[] of - * size 0. - * - * Please note that we speak of an "exception" here when we mean any - * "Throwable" object; so this term is equally used for "Exception" - * and "Error" objects. - * - */ -public interface ExceptionThrower { - - java.lang.Class[] getExceptions(); -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/F2D.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/F2D.java deleted file mode 100644 index 983b328f..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/F2D.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * F2D - Convert float to double - * 
Stack: ..., value -> ..., result.word1, result.word2
- * - */ -public class F2D extends ConversionInstruction { - - /** Convert float to double - */ - public F2D() { - super(org.apache.bcel.Const.F2D); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitConversionInstruction(this); - v.visitF2D(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/F2I.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/F2I.java deleted file mode 100644 index ee381a2e..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/F2I.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * F2I - Convert float to int - * 
Stack: ..., value -> ..., result
- * - */ -public class F2I extends ConversionInstruction { - - /** Convert float to int - */ - public F2I() { - super(org.apache.bcel.Const.F2I); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitConversionInstruction(this); - v.visitF2I(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/F2L.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/F2L.java deleted file mode 100644 index 2b733f30..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/F2L.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * F2L - Convert float to long - * 
Stack: ..., value -> ..., result.word1, result.word2
- * - */ -public class F2L extends ConversionInstruction { - - /** Convert float to long - */ - public F2L() { - super(org.apache.bcel.Const.F2L); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitConversionInstruction(this); - v.visitF2L(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FADD.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FADD.java deleted file mode 100644 index 4e00fbac..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FADD.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * FADD - Add floats - * 
Stack: ..., value1, value2 -> result
- * - */ -public class FADD extends ArithmeticInstruction { - - /** Add floats - */ - public FADD() { - super(org.apache.bcel.Const.FADD); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitArithmeticInstruction(this); - v.visitFADD(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FALOAD.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FALOAD.java deleted file mode 100644 index d34e1b27..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FALOAD.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * FALOAD - Load float from array - * 
Stack: ..., arrayref, index -> ..., value
- * - */ -public class FALOAD extends ArrayInstruction implements StackProducer { - - /** Load float from array - */ - public FALOAD() { - super(org.apache.bcel.Const.FALOAD); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackProducer(this); - v.visitExceptionThrower(this); - v.visitTypedInstruction(this); - v.visitArrayInstruction(this); - v.visitFALOAD(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FASTORE.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FASTORE.java deleted file mode 100644 index 6f1a0b42..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FASTORE.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * FASTORE - Store into float array - * 
Stack: ..., arrayref, index, value -> ...
- * - */ -public class FASTORE extends ArrayInstruction implements StackConsumer { - - /** Store float into array - */ - public FASTORE() { - super(org.apache.bcel.Const.FASTORE); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackConsumer(this); - v.visitExceptionThrower(this); - v.visitTypedInstruction(this); - v.visitArrayInstruction(this); - v.visitFASTORE(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FCMPG.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FCMPG.java deleted file mode 100644 index 7221faff..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FCMPG.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * FCMPG - Compare floats: value1 > value2 - * 
Stack: ..., value1, value2 -> ..., result
- * - */ -public class FCMPG extends Instruction implements TypedInstruction, StackProducer, StackConsumer { - - public FCMPG() { - super(org.apache.bcel.Const.FCMPG, (short) 1); - } - - - /** @return Type.FLOAT - */ - @Override - public Type getType( final ConstantPoolGen cp ) { - return Type.FLOAT; - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitFCMPG(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FCMPL.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FCMPL.java deleted file mode 100644 index 312c61b1..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FCMPL.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * FCMPL - Compare floats: value1 < value2 - * 
Stack: ..., value1, value2 -> ..., result
- * - */ -public class FCMPL extends Instruction implements TypedInstruction, StackProducer, StackConsumer { - - public FCMPL() { - super(org.apache.bcel.Const.FCMPL, (short) 1); - } - - - /** @return Type.FLOAT - */ - @Override - public Type getType( final ConstantPoolGen cp ) { - return Type.FLOAT; - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitFCMPL(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FCONST.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FCONST.java deleted file mode 100644 index 1c048e59..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FCONST.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * FCONST - Push 0.0, 1.0 or 2.0, other values cause an exception - * - * 
Stack: ... -> ...,
- * - */ -public class FCONST extends Instruction implements ConstantPushInstruction { - - private float value; - - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - FCONST() { - } - - - public FCONST(final float f) { - super(org.apache.bcel.Const.FCONST_0, (short) 1); - if (f == 0.0) { - super.setOpcode(org.apache.bcel.Const.FCONST_0); - } else if (f == 1.0) { - super.setOpcode(org.apache.bcel.Const.FCONST_1); - } else if (f == 2.0) { - super.setOpcode(org.apache.bcel.Const.FCONST_2); - } else { - throw new ClassGenException("FCONST can be used only for 0.0, 1.0 and 2.0: " + f); - } - value = f; - } - - - @Override - public Number getValue() { - return new Float(value); - } - - - /** @return Type.FLOAT - */ - @Override - public Type getType( final ConstantPoolGen cp ) { - return Type.FLOAT; - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitPushInstruction(this); - v.visitStackProducer(this); - v.visitTypedInstruction(this); - v.visitConstantPushInstruction(this); - v.visitFCONST(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FDIV.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FDIV.java deleted file mode 100644 index d89831a7..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FDIV.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * FDIV - Divide floats - * 
Stack: ..., value1, value2 -> result
- * - */ -public class FDIV extends ArithmeticInstruction { - - /** Divide floats - */ - public FDIV() { - super(org.apache.bcel.Const.FDIV); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitArithmeticInstruction(this); - v.visitFDIV(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FLOAD.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FLOAD.java deleted file mode 100644 index 8cc14118..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FLOAD.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * FLOAD - Load float from local variable - * 
Stack ... -> ..., result
- * - */ -public class FLOAD extends LoadInstruction { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - FLOAD() { - super(org.apache.bcel.Const.FLOAD, org.apache.bcel.Const.FLOAD_0); - } - - - /** Load float from local variable - * @param n index of local variable - */ - public FLOAD(final int n) { - super(org.apache.bcel.Const.FLOAD, org.apache.bcel.Const.FLOAD_0, n); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - super.accept(v); - v.visitFLOAD(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FMUL.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FMUL.java deleted file mode 100644 index b3f2ee18..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FMUL.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * FMUL - Multiply floats - * 
Stack: ..., value1, value2 -> result
- * - */ -public class FMUL extends ArithmeticInstruction { - - /** Multiply floats - */ - public FMUL() { - super(org.apache.bcel.Const.FMUL); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitArithmeticInstruction(this); - v.visitFMUL(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FNEG.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FNEG.java deleted file mode 100644 index a5d7df85..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FNEG.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * FNEG - Negate float - * 
Stack: ..., value -> ..., result
- * - */ -public class FNEG extends ArithmeticInstruction { - - public FNEG() { - super(org.apache.bcel.Const.FNEG); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitArithmeticInstruction(this); - v.visitFNEG(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FREM.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FREM.java deleted file mode 100644 index be24ba73..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FREM.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * FREM - Remainder of floats - * 
Stack: ..., value1, value2 -> result
- * - */ -public class FREM extends ArithmeticInstruction { - - /** Remainder of floats - */ - public FREM() { - super(org.apache.bcel.Const.FREM); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitArithmeticInstruction(this); - v.visitFREM(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FRETURN.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FRETURN.java deleted file mode 100644 index 7b26d3aa..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FRETURN.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * FRETURN - Return float from method - * 
Stack: ..., value -> <empty>
- * - */ -public class FRETURN extends ReturnInstruction { - - /** Return float from method - */ - public FRETURN() { - super(org.apache.bcel.Const.FRETURN); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitExceptionThrower(this); - v.visitTypedInstruction(this); - v.visitStackConsumer(this); - v.visitReturnInstruction(this); - v.visitFRETURN(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FSTORE.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FSTORE.java deleted file mode 100644 index c73d1b6b..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FSTORE.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * FSTORE - Store float into local variable - * 
Stack: ..., value -> ...
- * - */ -public class FSTORE extends StoreInstruction { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - FSTORE() { - super(org.apache.bcel.Const.FSTORE, org.apache.bcel.Const.FSTORE_0); - } - - - /** Store float into local variable - * @param n index of local variable - */ - public FSTORE(final int n) { - super(org.apache.bcel.Const.FSTORE, org.apache.bcel.Const.FSTORE_0, n); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - super.accept(v); - v.visitFSTORE(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FSUB.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FSUB.java deleted file mode 100644 index 02439c55..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FSUB.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * FSUB - Substract floats - * 
Stack: ..., value1, value2 -> result
- * - */ -public class FSUB extends ArithmeticInstruction { - - /** Substract floats - */ - public FSUB() { - super(org.apache.bcel.Const.FSUB); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitArithmeticInstruction(this); - v.visitFSUB(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FieldGen.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FieldGen.java deleted file mode 100644 index 5efb131b..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FieldGen.java +++ /dev/null @@ -1,381 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; - -import org.apache.bcel.Const; -import org.apache.bcel.classfile.AnnotationEntry; -import org.apache.bcel.classfile.Annotations; -import org.apache.bcel.classfile.Attribute; -import org.apache.bcel.classfile.Constant; -import org.apache.bcel.classfile.ConstantObject; -import org.apache.bcel.classfile.ConstantPool; -import org.apache.bcel.classfile.ConstantValue; -import org.apache.bcel.classfile.Field; -import org.apache.bcel.classfile.Utility; -import org.apache.bcel.util.BCELComparator; - -/** - * Template class for building up a field. The only extraordinary thing - * one can do is to add a constant value attribute to a field (which must of - * course be compatible with to the declared type). - * - * @see Field - */ -public class FieldGen extends FieldGenOrMethodGen { - - private Object value = null; - private static BCELComparator bcelComparator = new BCELComparator() { - - @Override - public boolean equals( final Object o1, final Object o2 ) { - final FieldGen THIS = (FieldGen) o1; - final FieldGen THAT = (FieldGen) o2; - return Objects.equals(THIS.getName(), THAT.getName()) - && Objects.equals(THIS.getSignature(), THAT.getSignature()); - } - - - @Override - public int hashCode( final Object o ) { - final FieldGen THIS = (FieldGen) o; - return THIS.getSignature().hashCode() ^ THIS.getName().hashCode(); - } - }; - - - /** - * Declare a field. If it is static (isStatic() == true) and has a - * basic type like int or String it may have an initial value - * associated with it as defined by setInitValue(). - * - * @param access_flags access qualifiers - * @param type field type - * @param name field name - * @param cp constant pool - */ - public FieldGen(final int access_flags, final Type type, final String name, final ConstantPoolGen cp) { - super(access_flags); - setType(type); - setName(name); - setConstantPool(cp); - } - - - /** - * Instantiate from existing field. - * - * @param field Field object - * @param cp constant pool (must contain the same entries as the field's constant pool) - */ - public FieldGen(final Field field, final ConstantPoolGen cp) { - this(field.getAccessFlags(), Type.getType(field.getSignature()), field.getName(), cp); - final Attribute[] attrs = field.getAttributes(); - for (final Attribute attr : attrs) { - if (attr instanceof ConstantValue) { - setValue(((ConstantValue) attr).getConstantValueIndex()); - } else if (attr instanceof Annotations) { - final Annotations runtimeAnnotations = (Annotations)attr; - final AnnotationEntry[] annotationEntries = runtimeAnnotations.getAnnotationEntries(); - for (final AnnotationEntry element : annotationEntries) { - addAnnotationEntry(new AnnotationEntryGen(element,cp,false)); - } - } else { - addAttribute(attr); - } - } - } - - - private void setValue( final int index ) { - final ConstantPool cp = super.getConstantPool().getConstantPool(); - final Constant c = cp.getConstant(index); - value = ((ConstantObject) c).getConstantValue(cp); - } - - - /** - * Set (optional) initial value of field, otherwise it will be set to null/0/false - * by the JVM automatically. - */ - public void setInitValue( final String str ) { - checkType( ObjectType.getInstance("java.lang.String")); - if (str != null) { - value = str; - } - } - - - public void setInitValue( final long l ) { - checkType(Type.LONG); - if (l != 0L) { - value = Long.valueOf(l); - } - } - - - public void setInitValue( final int i ) { - checkType(Type.INT); - if (i != 0) { - value = Integer.valueOf(i); - } - } - - - public void setInitValue( final short s ) { - checkType(Type.SHORT); - if (s != 0) { - value = Integer.valueOf(s); - } - } - - - public void setInitValue( final char c ) { - checkType(Type.CHAR); - if (c != 0) { - value = Integer.valueOf(c); - } - } - - - public void setInitValue( final byte b ) { - checkType(Type.BYTE); - if (b != 0) { - value = Integer.valueOf(b); - } - } - - - public void setInitValue( final boolean b ) { - checkType(Type.BOOLEAN); - if (b) { - value = Integer.valueOf(1); - } - } - - - public void setInitValue( final float f ) { - checkType(Type.FLOAT); - if (f != 0.0) { - value = new Float(f); - } - } - - - public void setInitValue( final double d ) { - checkType(Type.DOUBLE); - if (d != 0.0) { - value = new Double(d); - } - } - - - /** Remove any initial value. - */ - public void cancelInitValue() { - value = null; - } - - - private void checkType( final Type atype ) { - final Type superType = super.getType(); - if (superType == null) { - throw new ClassGenException("You haven't defined the type of the field yet"); - } - if (!isFinal()) { - throw new ClassGenException("Only final fields may have an initial value!"); - } - if (!superType.equals(atype)) { - throw new ClassGenException("Types are not compatible: " + superType + " vs. " + atype); - } - } - - - /** - * Get field object after having set up all necessary values. - */ - public Field getField() { - final String signature = getSignature(); - final int name_index = super.getConstantPool().addUtf8(super.getName()); - final int signature_index = super.getConstantPool().addUtf8(signature); - if (value != null) { - checkType(super.getType()); - final int index = addConstant(); - addAttribute(new ConstantValue(super.getConstantPool().addUtf8("ConstantValue"), 2, index, - super.getConstantPool().getConstantPool())); // sic - } - addAnnotationsAsAttribute(super.getConstantPool()); - return new Field(super.getAccessFlags(), name_index, signature_index, getAttributes(), - super.getConstantPool().getConstantPool()); // sic - } - - private void addAnnotationsAsAttribute(final ConstantPoolGen cp) { - final Attribute[] attrs = AnnotationEntryGen.getAnnotationAttributes(cp, super.getAnnotationEntries()); - for (final Attribute attr : attrs) { - addAttribute(attr); - } - } - - - private int addConstant() { - switch (super.getType().getType()) { // sic - case Const.T_INT: - case Const.T_CHAR: - case Const.T_BYTE: - case Const.T_BOOLEAN: - case Const.T_SHORT: - return super.getConstantPool().addInteger(((Integer) value).intValue()); - case Const.T_FLOAT: - return super.getConstantPool().addFloat(((Float) value).floatValue()); - case Const.T_DOUBLE: - return super.getConstantPool().addDouble(((Double) value).doubleValue()); - case Const.T_LONG: - return super.getConstantPool().addLong(((Long) value).longValue()); - case Const.T_REFERENCE: - return super.getConstantPool().addString((String) value); - default: - throw new IllegalStateException("Unhandled : " + super.getType().getType()); // sic - } - } - - - @Override - public String getSignature() { - return super.getType().getSignature(); - } - - private List observers; - - - /** Add observer for this object. - */ - public void addObserver( final FieldObserver o ) { - if (observers == null) { - observers = new ArrayList<>(); - } - observers.add(o); - } - - - /** Remove observer for this object. - */ - public void removeObserver( final FieldObserver o ) { - if (observers != null) { - observers.remove(o); - } - } - - - /** Call notify() method on all observers. This method is not called - * automatically whenever the state has changed, but has to be - * called by the user after he has finished editing the object. - */ - public void update() { - if (observers != null) { - for (final FieldObserver observer : observers ) { - observer.notify(this); - } - } - } - - - public String getInitValue() { - if (value != null) { - return value.toString(); - } - return null; - } - - - /** - * Return string representation close to declaration format, - * `public static final short MAX = 100', e.g.. - * - * @return String representation of field - */ - @Override - public final String toString() { - String name; - String signature; - String access; // Short cuts to constant pool - access = Utility.accessToString(super.getAccessFlags()); - access = access.isEmpty() ? "" : (access + " "); - signature = super.getType().toString(); - name = getName(); - final StringBuilder buf = new StringBuilder(32); // CHECKSTYLE IGNORE MagicNumber - buf.append(access).append(signature).append(" ").append(name); - final String value = getInitValue(); - if (value != null) { - buf.append(" = ").append(value); - } - return buf.toString(); - } - - - /** @return deep copy of this field - */ - public FieldGen copy( final ConstantPoolGen cp ) { - final FieldGen fg = (FieldGen) clone(); - fg.setConstantPool(cp); - return fg; - } - - - /** - * @return Comparison strategy object - */ - public static BCELComparator getComparator() { - return bcelComparator; - } - - - /** - * @param comparator Comparison strategy object - */ - public static void setComparator( final BCELComparator comparator ) { - bcelComparator = comparator; - } - - - /** - * Return value as defined by given BCELComparator strategy. - * By default two FieldGen objects are said to be equal when - * their names and signatures are equal. - * - * @see java.lang.Object#equals(java.lang.Object) - */ - @Override - public boolean equals( final Object obj ) { - return bcelComparator.equals(this, obj); - } - - - /** - * Return value as defined by given BCELComparator strategy. - * By default return the hashcode of the field's name XOR signature. - * - * @see java.lang.Object#hashCode() - */ - @Override - public int hashCode() { - return bcelComparator.hashCode(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FieldGenOrMethodGen.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FieldGenOrMethodGen.java deleted file mode 100644 index 56a0d24d..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FieldGenOrMethodGen.java +++ /dev/null @@ -1,190 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.bcel.Const; -import org.apache.bcel.classfile.AccessFlags; -import org.apache.bcel.classfile.Attribute; - -/** - * Super class for FieldGen and MethodGen objects, since they have - * some methods in common! - * - */ -public abstract class FieldGenOrMethodGen extends AccessFlags implements NamedAndTyped, Cloneable { - - /** - * @deprecated (since 6.0) will be made private; do not access directly, use getter/setter - */ - @Deprecated - protected String name; - - /** - * @deprecated (since 6.0) will be made private; do not access directly, use getter/setter - */ - @Deprecated - protected Type type; - - /** - * @deprecated (since 6.0) will be made private; do not access directly, use getter/setter - */ - @Deprecated - protected ConstantPoolGen cp; - - private final List attributeList = new ArrayList<>(); - - // @since 6.0 - private final List annotationList= new ArrayList<>(); - - - protected FieldGenOrMethodGen() { - } - - - /** - * @since 6.0 - */ - protected FieldGenOrMethodGen(final int access_flags) { // TODO could this be package protected? - super(access_flags); - } - - @Override - public void setType( final Type type ) { // TODO could be package-protected? - if (type.getType() == Const.T_ADDRESS) { - throw new IllegalArgumentException("Type can not be " + type); - } - this.type = type; - } - - - @Override - public Type getType() { - return type; - } - - - /** @return name of method/field. - */ - @Override - public String getName() { - return name; - } - - - @Override - public void setName( final String name ) { // TODO could be package-protected? - this.name = name; - } - - - public ConstantPoolGen getConstantPool() { - return cp; - } - - - public void setConstantPool( final ConstantPoolGen cp ) { // TODO could be package-protected? - this.cp = cp; - } - - - /** - * Add an attribute to this method. Currently, the JVM knows about - * the `Code', `ConstantValue', `Synthetic' and `Exceptions' - * attributes. Other attributes will be ignored by the JVM but do no - * harm. - * - * @param a attribute to be added - */ - public void addAttribute( final Attribute a ) { - attributeList.add(a); - } - - /** - * @since 6.0 - */ - public void addAnnotationEntry(final AnnotationEntryGen ag) - { - annotationList.add(ag); - } - - - /** - * Remove an attribute. - */ - public void removeAttribute( final Attribute a ) { - attributeList.remove(a); - } - - /** - * @since 6.0 - */ - public void removeAnnotationEntry(final AnnotationEntryGen ag) - { - annotationList.remove(ag); - } - - - /** - * Remove all attributes. - */ - public void removeAttributes() { - attributeList.clear(); - } - - /** - * @since 6.0 - */ - public void removeAnnotationEntries() - { - annotationList.clear(); - } - - - /** - * @return all attributes of this method. - */ - public Attribute[] getAttributes() { - final Attribute[] attributes = new Attribute[attributeList.size()]; - attributeList.toArray(attributes); - return attributes; - } - - public AnnotationEntryGen[] getAnnotationEntries() { - final AnnotationEntryGen[] annotations = new AnnotationEntryGen[annotationList.size()]; - annotationList.toArray(annotations); - return annotations; - } - - - /** @return signature of method/field. - */ - public abstract String getSignature(); - - - @Override - public Object clone() { - try { - return super.clone(); - } catch (final CloneNotSupportedException e) { - throw new Error("Clone Not Supported"); // never happens - } - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FieldInstruction.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FieldInstruction.java deleted file mode 100644 index bc9df8ac..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FieldInstruction.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import org.apache.bcel.classfile.ConstantPool; - -/** - * Super class for the GET/PUTxxx family of instructions. - * - */ -public abstract class FieldInstruction extends FieldOrMethod { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - FieldInstruction() { - } - - - /** - * @param index to constant pool - */ - protected FieldInstruction(final short opcode, final int index) { - super(opcode, index); - } - - - /** - * @return mnemonic for instruction with symbolic references resolved - */ - @Override - public String toString( final ConstantPool cp ) { - return org.apache.bcel.Const.getOpcodeName(super.getOpcode()) + " " - + cp.constantToString(super.getIndex(), org.apache.bcel.Const.CONSTANT_Fieldref); - } - - - /** @return size of field (1 or 2) - */ - protected int getFieldSize( final ConstantPoolGen cpg ) { - return Type.size(Type.getTypeSize(getSignature(cpg))); - } - - - /** @return return type of referenced field - */ - @Override - public Type getType( final ConstantPoolGen cpg ) { - return getFieldType(cpg); - } - - - /** @return type of field - */ - public Type getFieldType( final ConstantPoolGen cpg ) { - return Type.getType(getSignature(cpg)); - } - - - /** @return name of referenced field. - */ - public String getFieldName( final ConstantPoolGen cpg ) { - return getName(cpg); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FieldObserver.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FieldObserver.java deleted file mode 100644 index 9641a420..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FieldObserver.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * Imnplement this interface if you're interested in changes to a FieldGen object - * and register yourself with addObserver(). - * - */ -public interface FieldObserver { - - void notify( FieldGen field ); -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FieldOrMethod.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FieldOrMethod.java deleted file mode 100644 index 55e71995..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/FieldOrMethod.java +++ /dev/null @@ -1,140 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import org.apache.bcel.Const; -import org.apache.bcel.classfile.ConstantCP; -import org.apache.bcel.classfile.ConstantNameAndType; -import org.apache.bcel.classfile.ConstantPool; -import org.apache.bcel.classfile.ConstantUtf8; - -/** - * Super class for InvokeInstruction and FieldInstruction, since they have - * some methods in common! - * - */ -public abstract class FieldOrMethod extends CPInstruction implements LoadClass { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - FieldOrMethod() { - // no init - } - - - /** - * @param index to constant pool - */ - protected FieldOrMethod(final short opcode, final int index) { - super(opcode, index); - } - - - /** @return signature of referenced method/field. - */ - public String getSignature(final ConstantPoolGen cpg) { - final ConstantPool cp = cpg.getConstantPool(); - final ConstantCP cmr = (ConstantCP) cp.getConstant(super.getIndex()); - final ConstantNameAndType cnat = (ConstantNameAndType) cp.getConstant(cmr.getNameAndTypeIndex()); - return ((ConstantUtf8) cp.getConstant(cnat.getSignatureIndex())).getBytes(); - } - - - /** @return name of referenced method/field. - */ - public String getName(final ConstantPoolGen cpg) { - final ConstantPool cp = cpg.getConstantPool(); - final ConstantCP cmr = (ConstantCP) cp.getConstant(super.getIndex()); - final ConstantNameAndType cnat = (ConstantNameAndType) cp.getConstant(cmr.getNameAndTypeIndex()); - return ((ConstantUtf8) cp.getConstant(cnat.getNameIndex())).getBytes(); - } - - - /** - * @return name of the referenced class/interface - * @deprecated If the instruction references an array class, - * this method will return "java.lang.Object". - * For code generated by Java 1.5, this answer is - * sometimes wrong (e.g., if the "clone()" method is - * called on an array). A better idea is to use - * the {@link #getReferenceType(ConstantPoolGen)} method, which correctly distinguishes - * between class types and array types. - * - */ - @Deprecated - public String getClassName(final ConstantPoolGen cpg) { - final ConstantPool cp = cpg.getConstantPool(); - final ConstantCP cmr = (ConstantCP) cp.getConstant(super.getIndex()); - final String className = cp.getConstantString(cmr.getClassIndex(), Const.CONSTANT_Class); - if (className.startsWith("[")) { - // Turn array classes into java.lang.Object. - return "java.lang.Object"; - } - return className.replace('/', '.'); - } - - - /** @return type of the referenced class/interface - * @deprecated If the instruction references an array class, - * the ObjectType returned will be invalid. Use - * getReferenceType() instead. - */ - @Deprecated - public ObjectType getClassType(final ConstantPoolGen cpg) { - return ObjectType.getInstance(getClassName(cpg)); - } - - - /** - * Gets the reference type representing the class, interface, - * or array class referenced by the instruction. - * @param cpg the ConstantPoolGen used to create the instruction - * @return an ObjectType (if the referenced class type is a class - * or interface), or an ArrayType (if the referenced class - * type is an array class) - */ - public ReferenceType getReferenceType(final ConstantPoolGen cpg) { - final ConstantPool cp = cpg.getConstantPool(); - final ConstantCP cmr = (ConstantCP) cp.getConstant(super.getIndex()); - String className = cp.getConstantString(cmr.getClassIndex(), Const.CONSTANT_Class); - if (className.startsWith("[")) { - return (ArrayType) Type.getType(className); - } - className = className.replace('/', '.'); - return ObjectType.getInstance(className); - } - - - /** - * Gets the ObjectType of the method return or field. - * - * @return type of the referenced class/interface - * @throws ClassGenException when the field is (or method returns) an array, - */ - @Override - public ObjectType getLoadClassType(final ConstantPoolGen cpg) { - final ReferenceType rt = getReferenceType(cpg); - if (rt instanceof ObjectType) { - return (ObjectType) rt; - } - throw new ClassGenException( - rt.getClass().getCanonicalName() + " " + rt.getSignature() + " does not represent an ObjectType"); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/GETFIELD.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/GETFIELD.java deleted file mode 100644 index 81b147e2..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/GETFIELD.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import org.apache.bcel.Const; -import org.apache.bcel.ExceptionConst; - -/** - * GETFIELD - Fetch field from object - * 
Stack: ..., objectref -> ..., value
- * OR - * 
Stack: ..., objectref -> ..., value.word1, value.word2
- * - */ -public class GETFIELD extends FieldInstruction implements ExceptionThrower, StackConsumer, - StackProducer { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - GETFIELD() { - } - - - public GETFIELD(final int index) { - super(Const.GETFIELD, index); - } - - - @Override - public int produceStack( final ConstantPoolGen cpg ) { - return getFieldSize(cpg); - } - - - @Override - public Class[] getExceptions() { - return ExceptionConst.createExceptions(ExceptionConst.EXCS.EXCS_FIELD_AND_METHOD_RESOLUTION, - ExceptionConst.NULL_POINTER_EXCEPTION, - ExceptionConst.INCOMPATIBLE_CLASS_CHANGE_ERROR); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitExceptionThrower(this); - v.visitStackConsumer(this); - v.visitStackProducer(this); - v.visitTypedInstruction(this); - v.visitLoadClass(this); - v.visitCPInstruction(this); - v.visitFieldOrMethod(this); - v.visitFieldInstruction(this); - v.visitGETFIELD(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/GETSTATIC.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/GETSTATIC.java deleted file mode 100644 index 9d04613c..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/GETSTATIC.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import org.apache.bcel.Const; -import org.apache.bcel.ExceptionConst; - -/** - * GETSTATIC - Fetch static field from class - * 
Stack: ..., -> ..., value
- * OR - * 
Stack: ..., -> ..., value.word1, value.word2
- * - */ -public class GETSTATIC extends FieldInstruction implements PushInstruction, ExceptionThrower { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - GETSTATIC() { - } - - - public GETSTATIC(final int index) { - super(Const.GETSTATIC, index); - } - - - @Override - public int produceStack( final ConstantPoolGen cpg ) { - return getFieldSize(cpg); - } - - - @Override - public Class[] getExceptions() { - return ExceptionConst.createExceptions(ExceptionConst.EXCS.EXCS_FIELD_AND_METHOD_RESOLUTION, - ExceptionConst.INCOMPATIBLE_CLASS_CHANGE_ERROR); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackProducer(this); - v.visitPushInstruction(this); - v.visitExceptionThrower(this); - v.visitTypedInstruction(this); - v.visitLoadClass(this); - v.visitCPInstruction(this); - v.visitFieldOrMethod(this); - v.visitFieldInstruction(this); - v.visitGETSTATIC(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/GOTO.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/GOTO.java deleted file mode 100644 index 5f6ddcaf..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/GOTO.java +++ /dev/null @@ -1,98 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import java.io.DataOutputStream; -import java.io.IOException; - -/** - * GOTO - Branch always (to relative offset, not absolute address) - * - */ -public class GOTO extends GotoInstruction implements VariableLengthInstruction { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - GOTO() { - } - - - public GOTO(final InstructionHandle target) { - super(org.apache.bcel.Const.GOTO, target); - } - - - /** - * Dump instruction as byte code to stream out. - * @param out Output stream - */ - @Override - public void dump( final DataOutputStream out ) throws IOException { - super.setIndex(getTargetOffset()); - final short _opcode = getOpcode(); - if (_opcode == org.apache.bcel.Const.GOTO) { - super.dump(out); - } else { // GOTO_W - super.setIndex(getTargetOffset()); - out.writeByte(_opcode); - out.writeInt(super.getIndex()); - } - } - - - /** - * Called in pass 2 of InstructionList.setPositions() in order to update - * the branch target, that may shift due to variable length instructions. - * - * @param offset additional offset caused by preceding (variable length) instructions - * @param max_offset the maximum offset that may be caused by these instructions - * @return additional offset caused by possible change of this instruction's length - */ - @Override - protected int updatePosition( final int offset, final int max_offset ) { - final int i = getTargetOffset(); // Depending on old position value - setPosition(getPosition() + offset); // Position may be shifted by preceding expansions - if (Math.abs(i) >= (Short.MAX_VALUE - max_offset)) { // to large for short (estimate) - super.setOpcode(org.apache.bcel.Const.GOTO_W); - final short old_length = (short) super.getLength(); - super.setLength(5); - return super.getLength() - old_length; - } - return 0; - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitVariableLengthInstruction(this); - v.visitUnconditionalBranch(this); - v.visitBranchInstruction(this); - v.visitGotoInstruction(this); - v.visitGOTO(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/GOTO_W.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/GOTO_W.java deleted file mode 100644 index d2dfad44..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/GOTO_W.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.util.ByteSequence; - -/** - * GOTO_W - Branch always (to relative offset, not absolute address) - * - */ -public class GOTO_W extends GotoInstruction { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - GOTO_W() { - } - - - public GOTO_W(final InstructionHandle target) { - super(org.apache.bcel.Const.GOTO_W, target); - super.setLength(5); - } - - - /** - * Dump instruction as byte code to stream out. - * @param out Output stream - */ - @Override - public void dump( final DataOutputStream out ) throws IOException { - super.setIndex(getTargetOffset()); - out.writeByte(super.getOpcode()); - out.writeInt(super.getIndex()); - } - - - /** - * Read needed data (e.g. index) from file. - */ - @Override - protected void initFromFile( final ByteSequence bytes, final boolean wide ) throws IOException { - super.setIndex(bytes.readInt()); - super.setLength(5); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitUnconditionalBranch(this); - v.visitBranchInstruction(this); - v.visitGotoInstruction(this); - v.visitGOTO_W(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/GotoInstruction.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/GotoInstruction.java deleted file mode 100644 index 11c25eb6..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/GotoInstruction.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * Super class for GOTO - * - */ -public abstract class GotoInstruction extends BranchInstruction implements UnconditionalBranch { - - GotoInstruction(final short opcode, final InstructionHandle target) { - super(opcode, target); - } - - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - GotoInstruction() { - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/I2B.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/I2B.java deleted file mode 100644 index 011e2d41..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/I2B.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * I2B - Convert int to byte - * 
Stack: ..., value -> ..., result
- * - */ -public class I2B extends ConversionInstruction { - - /** Convert int to byte - */ - public I2B() { - super(org.apache.bcel.Const.I2B); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitConversionInstruction(this); - v.visitI2B(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/I2C.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/I2C.java deleted file mode 100644 index 796eec5b..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/I2C.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * I2C - Convert int to char - * 
Stack: ..., value -> ..., result
- * - */ -public class I2C extends ConversionInstruction { - - /** Convert int to char - */ - public I2C() { - super(org.apache.bcel.Const.I2C); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitConversionInstruction(this); - v.visitI2C(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/I2D.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/I2D.java deleted file mode 100644 index 32d69bd6..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/I2D.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * I2D - Convert int to double - * 
Stack: ..., value -> ..., result.word1, result.word2
- * - */ -public class I2D extends ConversionInstruction { - - /** Convert int to double - */ - public I2D() { - super(org.apache.bcel.Const.I2D); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitConversionInstruction(this); - v.visitI2D(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/I2F.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/I2F.java deleted file mode 100644 index 5615be13..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/I2F.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * I2F - Convert int to float - * 
Stack: ..., value -> ..., result
- * - */ -public class I2F extends ConversionInstruction { - - /** Convert int to float - */ - public I2F() { - super(org.apache.bcel.Const.I2F); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitConversionInstruction(this); - v.visitI2F(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/I2L.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/I2L.java deleted file mode 100644 index 0d0ac772..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/I2L.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * I2L - Convert int to long - * 
Stack: ..., value -> ..., result.word1, result.word2
- * - */ -public class I2L extends ConversionInstruction { - - /** Convert int to long - */ - public I2L() { - super(org.apache.bcel.Const.I2L); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitConversionInstruction(this); - v.visitI2L(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/I2S.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/I2S.java deleted file mode 100644 index 9753e876..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/I2S.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * I2S - Convert int to short - * 
Stack: ..., value -> ..., result
- * - */ -public class I2S extends ConversionInstruction { - - public I2S() { - super(org.apache.bcel.Const.I2S); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitConversionInstruction(this); - v.visitI2S(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IADD.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IADD.java deleted file mode 100644 index 7b605a9f..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IADD.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * IADD - Add ints - * 
Stack: ..., value1, value2 -> result
- * - */ -public class IADD extends ArithmeticInstruction { - - /** Add ints - */ - public IADD() { - super(org.apache.bcel.Const.IADD); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitArithmeticInstruction(this); - v.visitIADD(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IALOAD.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IALOAD.java deleted file mode 100644 index ad92df2f..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IALOAD.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * IALOAD - Load int from array - * 
Stack: ..., arrayref, index -> ..., value
- * - */ -public class IALOAD extends ArrayInstruction implements StackProducer { - - /** - * Load int from array - */ - public IALOAD() { - super(org.apache.bcel.Const.IALOAD); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackProducer(this); - v.visitExceptionThrower(this); - v.visitTypedInstruction(this); - v.visitArrayInstruction(this); - v.visitIALOAD(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IAND.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IAND.java deleted file mode 100644 index 5b564a13..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IAND.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * IAND - Bitwise AND int - * 
Stack: ..., value1, value2 -> ..., result
- * - */ -public class IAND extends ArithmeticInstruction { - - public IAND() { - super(org.apache.bcel.Const.IAND); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitArithmeticInstruction(this); - v.visitIAND(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IASTORE.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IASTORE.java deleted file mode 100644 index 32bf43c5..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IASTORE.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * IASTORE - Store into int array - * 
Stack: ..., arrayref, index, value -> ...
- * - */ -public class IASTORE extends ArrayInstruction implements StackConsumer { - - /** - * Store into int array - */ - public IASTORE() { - super(org.apache.bcel.Const.IASTORE); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackConsumer(this); - v.visitExceptionThrower(this); - v.visitTypedInstruction(this); - v.visitArrayInstruction(this); - v.visitIASTORE(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ICONST.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ICONST.java deleted file mode 100644 index 7404a3e8..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ICONST.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * ICONST - Push value between -1, ..., 5, other values cause an exception - * - * 
Stack: ... -> ...,
- * - */ -public class ICONST extends Instruction implements ConstantPushInstruction { - - private int value; - - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - ICONST() { - } - - - public ICONST(final int i) { - super(org.apache.bcel.Const.ICONST_0, (short) 1); - if ((i >= -1) && (i <= 5)) { - super.setOpcode((short) (org.apache.bcel.Const.ICONST_0 + i)); // Even works for i == -1 - } else { - throw new ClassGenException("ICONST can be used only for value between -1 and 5: " + i); - } - value = i; - } - - - @Override - public Number getValue() { - return Integer.valueOf(value); - } - - - /** @return Type.INT - */ - @Override - public Type getType( final ConstantPoolGen cp ) { - return Type.INT; - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitPushInstruction(this); - v.visitStackProducer(this); - v.visitTypedInstruction(this); - v.visitConstantPushInstruction(this); - v.visitICONST(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IDIV.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IDIV.java deleted file mode 100644 index d97a612d..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IDIV.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import org.apache.bcel.ExceptionConst; - -/** - * IDIV - Divide ints - * 
Stack: ..., value1, value2 -> result
- * - */ -public class IDIV extends ArithmeticInstruction implements ExceptionThrower { - - /** Divide ints - */ - public IDIV() { - super(org.apache.bcel.Const.IDIV); - } - - - /** @return exceptions this instruction may cause - */ - @Override - public Class[] getExceptions() { - return new Class[] { - ExceptionConst.ARITHMETIC_EXCEPTION - }; - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitExceptionThrower(this); - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitArithmeticInstruction(this); - v.visitIDIV(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IFEQ.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IFEQ.java deleted file mode 100644 index 12911e48..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IFEQ.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * IFEQ - Branch if int comparison with zero succeeds - * - * 
Stack: ..., value -> ...
- * - */ -public class IFEQ extends IfInstruction { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - IFEQ() { - } - - - public IFEQ(final InstructionHandle target) { - super(org.apache.bcel.Const.IFEQ, target); - } - - - /** - * @return negation of instruction, e.g. IFEQ.negate() == IFNE - */ - @Override - public IfInstruction negate() { - return new IFNE(super.getTarget()); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackConsumer(this); - v.visitBranchInstruction(this); - v.visitIfInstruction(this); - v.visitIFEQ(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IFGE.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IFGE.java deleted file mode 100644 index 94046245..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IFGE.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * IFGE - Branch if int comparison with zero succeeds - * - * 
Stack: ..., value -> ...
- * - */ -public class IFGE extends IfInstruction { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - IFGE() { - } - - - public IFGE(final InstructionHandle target) { - super(org.apache.bcel.Const.IFGE, target); - } - - - /** - * @return negation of instruction - */ - @Override - public IfInstruction negate() { - return new IFLT(super.getTarget()); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackConsumer(this); - v.visitBranchInstruction(this); - v.visitIfInstruction(this); - v.visitIFGE(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IFGT.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IFGT.java deleted file mode 100644 index f1da4e97..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IFGT.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * IFGT - Branch if int comparison with zero succeeds - * - * 
Stack: ..., value -> ...
- * - */ -public class IFGT extends IfInstruction { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - IFGT() { - } - - - public IFGT(final InstructionHandle target) { - super(org.apache.bcel.Const.IFGT, target); - } - - - /** - * @return negation of instruction - */ - @Override - public IfInstruction negate() { - return new IFLE(super.getTarget()); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackConsumer(this); - v.visitBranchInstruction(this); - v.visitIfInstruction(this); - v.visitIFGT(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IFLE.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IFLE.java deleted file mode 100644 index d369807a..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IFLE.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * IFLE - Branch if int comparison with zero succeeds - * - * 
Stack: ..., value -> ...
- * - */ -public class IFLE extends IfInstruction { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - IFLE() { - } - - - public IFLE(final InstructionHandle target) { - super(org.apache.bcel.Const.IFLE, target); - } - - - /** - * @return negation of instruction - */ - @Override - public IfInstruction negate() { - return new IFGT(super.getTarget()); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackConsumer(this); - v.visitBranchInstruction(this); - v.visitIfInstruction(this); - v.visitIFLE(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IFLT.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IFLT.java deleted file mode 100644 index c9e416f5..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IFLT.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * IFLT - Branch if int comparison with zero succeeds - * - * 
Stack: ..., value -> ...
- * - */ -public class IFLT extends IfInstruction { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - IFLT() { - } - - - public IFLT(final InstructionHandle target) { - super(org.apache.bcel.Const.IFLT, target); - } - - - /** - * @return negation of instruction - */ - @Override - public IfInstruction negate() { - return new IFGE(super.getTarget()); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackConsumer(this); - v.visitBranchInstruction(this); - v.visitIfInstruction(this); - v.visitIFLT(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IFNE.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IFNE.java deleted file mode 100644 index 5506e5b5..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IFNE.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * IFNE - Branch if int comparison with zero succeeds - * - * 
Stack: ..., value -> ...
- * - */ -public class IFNE extends IfInstruction { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - IFNE() { - } - - - public IFNE(final InstructionHandle target) { - super(org.apache.bcel.Const.IFNE, target); - } - - - /** - * @return negation of instruction - */ - @Override - public IfInstruction negate() { - return new IFEQ(super.getTarget()); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackConsumer(this); - v.visitBranchInstruction(this); - v.visitIfInstruction(this); - v.visitIFNE(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IFNONNULL.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IFNONNULL.java deleted file mode 100644 index 93773c88..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IFNONNULL.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * IFNONNULL - Branch if reference is not null - * - * 
Stack: ..., reference -> ...
- * - */ -public class IFNONNULL extends IfInstruction { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - IFNONNULL() { - } - - - public IFNONNULL(final InstructionHandle target) { - super(org.apache.bcel.Const.IFNONNULL, target); - } - - - /** - * @return negation of instruction - */ - @Override - public IfInstruction negate() { - return new IFNULL(super.getTarget()); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackConsumer(this); - v.visitBranchInstruction(this); - v.visitIfInstruction(this); - v.visitIFNONNULL(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IFNULL.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IFNULL.java deleted file mode 100644 index aa4f1261..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IFNULL.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * IFNULL - Branch if reference is not null - * - * 
Stack: ..., reference -> ...
- * - */ -public class IFNULL extends IfInstruction { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - IFNULL() { - } - - - public IFNULL(final InstructionHandle target) { - super(org.apache.bcel.Const.IFNULL, target); - } - - - /** - * @return negation of instruction - */ - @Override - public IfInstruction negate() { - return new IFNONNULL(super.getTarget()); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackConsumer(this); - v.visitBranchInstruction(this); - v.visitIfInstruction(this); - v.visitIFNULL(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IF_ACMPEQ.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IF_ACMPEQ.java deleted file mode 100644 index 53340b98..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IF_ACMPEQ.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * IF_ACMPEQ - Branch if reference comparison succeeds - * - * 
Stack: ..., value1, value2 -> ...
- * - */ -public class IF_ACMPEQ extends IfInstruction { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - IF_ACMPEQ() { - } - - - public IF_ACMPEQ(final InstructionHandle target) { - super(org.apache.bcel.Const.IF_ACMPEQ, target); - } - - - /** - * @return negation of instruction - */ - @Override - public IfInstruction negate() { - return new IF_ACMPNE(super.getTarget()); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackConsumer(this); - v.visitBranchInstruction(this); - v.visitIfInstruction(this); - v.visitIF_ACMPEQ(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IF_ACMPNE.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IF_ACMPNE.java deleted file mode 100644 index a6e644a0..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IF_ACMPNE.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * IF_ACMPNE - Branch if reference comparison doesn't succeed - * - * 
Stack: ..., value1, value2 -> ...
- * - */ -public class IF_ACMPNE extends IfInstruction { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - IF_ACMPNE() { - } - - - public IF_ACMPNE(final InstructionHandle target) { - super(org.apache.bcel.Const.IF_ACMPNE, target); - } - - - /** - * @return negation of instruction - */ - @Override - public IfInstruction negate() { - return new IF_ACMPEQ(super.getTarget()); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackConsumer(this); - v.visitBranchInstruction(this); - v.visitIfInstruction(this); - v.visitIF_ACMPNE(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IF_ICMPEQ.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IF_ICMPEQ.java deleted file mode 100644 index 47a4f31e..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IF_ICMPEQ.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * IF_ICMPEQ - Branch if int comparison succeeds - * - * 
Stack: ..., value1, value2 -> ...
- * - */ -public class IF_ICMPEQ extends IfInstruction { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - IF_ICMPEQ() { - } - - - public IF_ICMPEQ(final InstructionHandle target) { - super(org.apache.bcel.Const.IF_ICMPEQ, target); - } - - - /** - * @return negation of instruction - */ - @Override - public IfInstruction negate() { - return new IF_ICMPNE(super.getTarget()); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackConsumer(this); - v.visitBranchInstruction(this); - v.visitIfInstruction(this); - v.visitIF_ICMPEQ(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IF_ICMPGE.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IF_ICMPGE.java deleted file mode 100644 index 47684e18..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IF_ICMPGE.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * IF_ICMPGE - Branch if int comparison succeeds - * - * 
Stack: ..., value1, value2 -> ...
- * - */ -public class IF_ICMPGE extends IfInstruction { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - IF_ICMPGE() { - } - - - public IF_ICMPGE(final InstructionHandle target) { - super(org.apache.bcel.Const.IF_ICMPGE, target); - } - - - /** - * @return negation of instruction - */ - @Override - public IfInstruction negate() { - return new IF_ICMPLT(super.getTarget()); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackConsumer(this); - v.visitBranchInstruction(this); - v.visitIfInstruction(this); - v.visitIF_ICMPGE(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IF_ICMPGT.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IF_ICMPGT.java deleted file mode 100644 index a971cc03..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IF_ICMPGT.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * IF_ICMPGT - Branch if int comparison succeeds - * - * 
Stack: ..., value1, value2 -> ...
- * - */ -public class IF_ICMPGT extends IfInstruction { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - IF_ICMPGT() { - } - - - public IF_ICMPGT(final InstructionHandle target) { - super(org.apache.bcel.Const.IF_ICMPGT, target); - } - - - /** - * @return negation of instruction - */ - @Override - public IfInstruction negate() { - return new IF_ICMPLE(super.getTarget()); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackConsumer(this); - v.visitBranchInstruction(this); - v.visitIfInstruction(this); - v.visitIF_ICMPGT(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IF_ICMPLE.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IF_ICMPLE.java deleted file mode 100644 index 947f1656..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IF_ICMPLE.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * IF_ICMPLE - Branch if int comparison succeeds - * - * 
Stack: ..., value1, value2 -> ...
- * - */ -public class IF_ICMPLE extends IfInstruction { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - IF_ICMPLE() { - } - - - public IF_ICMPLE(final InstructionHandle target) { - super(org.apache.bcel.Const.IF_ICMPLE, target); - } - - - /** - * @return negation of instruction - */ - @Override - public IfInstruction negate() { - return new IF_ICMPGT(super.getTarget()); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackConsumer(this); - v.visitBranchInstruction(this); - v.visitIfInstruction(this); - v.visitIF_ICMPLE(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IF_ICMPLT.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IF_ICMPLT.java deleted file mode 100644 index cd187a9f..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IF_ICMPLT.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * IF_ICMPLT - Branch if int comparison succeeds - * - * 
Stack: ..., value1, value2 -> ...
- * - */ -public class IF_ICMPLT extends IfInstruction { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - IF_ICMPLT() { - } - - - public IF_ICMPLT(final InstructionHandle target) { - super(org.apache.bcel.Const.IF_ICMPLT, target); - } - - - /** - * @return negation of instruction - */ - @Override - public IfInstruction negate() { - return new IF_ICMPGE(super.getTarget()); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackConsumer(this); - v.visitBranchInstruction(this); - v.visitIfInstruction(this); - v.visitIF_ICMPLT(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IF_ICMPNE.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IF_ICMPNE.java deleted file mode 100644 index 11b5db2b..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IF_ICMPNE.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * IF_ICMPNE - Branch if int comparison doesn't succeed - * - * 
Stack: ..., value1, value2 -> ...
- * - */ -public class IF_ICMPNE extends IfInstruction { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - IF_ICMPNE() { - } - - - public IF_ICMPNE(final InstructionHandle target) { - super(org.apache.bcel.Const.IF_ICMPNE, target); - } - - - /** - * @return negation of instruction - */ - @Override - public IfInstruction negate() { - return new IF_ICMPEQ(super.getTarget()); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackConsumer(this); - v.visitBranchInstruction(this); - v.visitIfInstruction(this); - v.visitIF_ICMPNE(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IINC.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IINC.java deleted file mode 100644 index bf078d80..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IINC.java +++ /dev/null @@ -1,169 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.util.ByteSequence; - -/** - * IINC - Increment local variable by constant - * - */ -public class IINC extends LocalVariableInstruction { - - private boolean wide; - private int c; - - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - IINC() { - } - - - /** - * @param n index of local variable - * @param c increment factor - */ - public IINC(final int n, final int c) { - super(); // Default behavior of LocalVariableInstruction causes error - super.setOpcode(org.apache.bcel.Const.IINC); - super.setLength((short) 3); - setIndex(n); // May set wide as side effect - setIncrement(c); - } - - - /** - * Dump instruction as byte code to stream out. - * @param out Output stream - */ - @Override - public void dump( final DataOutputStream out ) throws IOException { - if (wide) { - out.writeByte(org.apache.bcel.Const.WIDE); - } - out.writeByte(super.getOpcode()); - if (wide) { - out.writeShort(super.getIndex()); - out.writeShort(c); - } else { - out.writeByte(super.getIndex()); - out.writeByte(c); - } - } - - - private void setWide() { - wide = super.getIndex() > org.apache.bcel.Const.MAX_BYTE; - if (c > 0) { - wide = wide || (c > Byte.MAX_VALUE); - } else { - wide = wide || (c < Byte.MIN_VALUE); - } - if (wide) { - super.setLength(6); // wide byte included - } else { - super.setLength(3); - } - } - - - /** - * Read needed data (e.g. index) from file. - */ - @Override - protected void initFromFile( final ByteSequence bytes, final boolean wide ) throws IOException { - this.wide = wide; - if (wide) { - super.setLength(6); - super.setIndexOnly(bytes.readUnsignedShort()); - c = bytes.readShort(); - } else { - super.setLength(3); - super.setIndexOnly(bytes.readUnsignedByte()); - c = bytes.readByte(); - } - } - - - /** - * @return mnemonic for instruction - */ - @Override - public String toString( final boolean verbose ) { - return super.toString(verbose) + " " + c; - } - - - /** - * Set index of local variable. - */ - @Override - public final void setIndex( final int n ) { - if (n < 0) { - throw new ClassGenException("Negative index value: " + n); - } - super.setIndexOnly(n); - setWide(); - } - - - /** - * @return increment factor - */ - public final int getIncrement() { - return c; - } - - - /** - * Set increment factor. - */ - public final void setIncrement( final int c ) { - this.c = c; - setWide(); - } - - - /** @return int type - */ - @Override - public Type getType( final ConstantPoolGen cp ) { - return Type.INT; - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitLocalVariableInstruction(this); - v.visitIINC(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ILOAD.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ILOAD.java deleted file mode 100644 index dbb49492..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ILOAD.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * ILOAD - Load int from local variable onto stack - * 
Stack: ... -> ..., result
- * - */ -public class ILOAD extends LoadInstruction { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - ILOAD() { - super(org.apache.bcel.Const.ILOAD, org.apache.bcel.Const.ILOAD_0); - } - - - /** Load int from local variable - * @param n index of local variable - */ - public ILOAD(final int n) { - super(org.apache.bcel.Const.ILOAD, org.apache.bcel.Const.ILOAD_0, n); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - super.accept(v); - v.visitILOAD(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IMPDEP1.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IMPDEP1.java deleted file mode 100644 index 21b400c3..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IMPDEP1.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * IMPDEP1 - Implementation dependent - * - */ -public class IMPDEP1 extends Instruction { - - public IMPDEP1() { - super(org.apache.bcel.Const.IMPDEP1, (short) 1); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitIMPDEP1(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IMPDEP2.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IMPDEP2.java deleted file mode 100644 index b0d365ae..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IMPDEP2.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * IMPDEP2 - Implementation dependent - * - */ -public class IMPDEP2 extends Instruction { - - public IMPDEP2() { - super(org.apache.bcel.Const.IMPDEP2, (short) 1); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitIMPDEP2(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IMUL.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IMUL.java deleted file mode 100644 index e5d6f200..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IMUL.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * IMUL - Multiply ints - * 
Stack: ..., value1, value2 -> result
- * - */ -public class IMUL extends ArithmeticInstruction { - - /** Multiply ints - */ - public IMUL() { - super(org.apache.bcel.Const.IMUL); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitArithmeticInstruction(this); - v.visitIMUL(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/INEG.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/INEG.java deleted file mode 100644 index 0d4374b5..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/INEG.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * INEG - Negate int - * 
Stack: ..., value -> ..., result
- * - */ -public class INEG extends ArithmeticInstruction { - - public INEG() { - super(org.apache.bcel.Const.INEG); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitArithmeticInstruction(this); - v.visitINEG(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/INSTANCEOF.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/INSTANCEOF.java deleted file mode 100644 index d7fc123a..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/INSTANCEOF.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import org.apache.bcel.ExceptionConst; - -/** - * INSTANCEOF - Determine if object is of given type - * 
Stack: ..., objectref -> ..., result
- * - */ -public class INSTANCEOF extends CPInstruction implements LoadClass, ExceptionThrower, - StackProducer, StackConsumer { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - INSTANCEOF() { - } - - - public INSTANCEOF(final int index) { - super(org.apache.bcel.Const.INSTANCEOF, index); - } - - - @Override - public Class[] getExceptions() { - return ExceptionConst.createExceptions(ExceptionConst.EXCS.EXCS_CLASS_AND_INTERFACE_RESOLUTION); - } - - - @Override - public ObjectType getLoadClassType( final ConstantPoolGen cpg ) { - Type t = getType(cpg); - if (t instanceof ArrayType) { - t = ((ArrayType) t).getBasicType(); - } - return (t instanceof ObjectType) ? (ObjectType) t : null; - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitLoadClass(this); - v.visitExceptionThrower(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitTypedInstruction(this); - v.visitCPInstruction(this); - v.visitINSTANCEOF(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/INVOKEDYNAMIC.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/INVOKEDYNAMIC.java deleted file mode 100644 index 803ede8e..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/INVOKEDYNAMIC.java +++ /dev/null @@ -1,144 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; -import org.apache.bcel.ExceptionConst; -import org.apache.bcel.classfile.ConstantInvokeDynamic; -import org.apache.bcel.classfile.ConstantNameAndType; -import org.apache.bcel.classfile.ConstantPool; -import org.apache.bcel.util.ByteSequence; - -/** - * Class for INVOKEDYNAMIC. Not an instance of InvokeInstruction, since that class - * expects to be able to get the class of the method. Ignores the bootstrap - * mechanism entirely. - * - * @see - * - * The invokedynamic instruction in The Java Virtual Machine Specification - * @since 6.0 - */ -public class INVOKEDYNAMIC extends InvokeInstruction { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - INVOKEDYNAMIC() { - } - - - public INVOKEDYNAMIC(final int index) { - super(Const.INVOKEDYNAMIC, index); - } - - - /** - * Dump instruction as byte code to stream out. - * @param out Output stream - */ - @Override - public void dump( final DataOutputStream out ) throws IOException { - out.writeByte(super.getOpcode()); - out.writeShort(super.getIndex()); - out.writeByte(0); - out.writeByte(0); - } - - - /** - * Read needed data (i.e., index) from file. - */ - @Override - protected void initFromFile( final ByteSequence bytes, final boolean wide ) throws IOException { - super.initFromFile(bytes, wide); - super.setLength(5); - bytes.readByte(); // Skip 0 byte - bytes.readByte(); // Skip 0 byte - } - - - /** - * @return mnemonic for instruction with symbolic references resolved - */ - @Override - public String toString( final ConstantPool cp ) { - return super.toString(cp); - } - - - @Override - public Class[] getExceptions() { - return ExceptionConst.createExceptions(ExceptionConst.EXCS.EXCS_INTERFACE_METHOD_RESOLUTION, - ExceptionConst.UNSATISFIED_LINK_ERROR, - ExceptionConst.ABSTRACT_METHOD_ERROR, - ExceptionConst.ILLEGAL_ACCESS_ERROR, - ExceptionConst.INCOMPATIBLE_CLASS_CHANGE_ERROR); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitExceptionThrower(this); - v.visitTypedInstruction(this); - v.visitStackConsumer(this); - v.visitStackProducer(this); - v.visitLoadClass(this); - v.visitCPInstruction(this); - v.visitFieldOrMethod(this); - v.visitInvokeInstruction(this); - v.visitINVOKEDYNAMIC(this); - } - - /** - * Override the parent method because our classname is held elsewhere. - */ - @Override - public String getClassName( final ConstantPoolGen cpg ) { - final ConstantPool cp = cpg.getConstantPool(); - final ConstantInvokeDynamic cid = (ConstantInvokeDynamic) cp.getConstant(super.getIndex(), Const.CONSTANT_InvokeDynamic); - return ((ConstantNameAndType) cp.getConstant(cid.getNameAndTypeIndex())).getName(cp); - } - - - /** - * Since InvokeDynamic doesn't refer to a reference type, just return java.lang.Object, - * as that is the only type we can say for sure the reference will be. - * - * @param cpg - * the ConstantPoolGen used to create the instruction - * @return an ObjectType for java.lang.Object - * @since 6.1 - */ - @Override - public ReferenceType getReferenceType(final ConstantPoolGen cpg) { - return new ObjectType(Object.class.getName()); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/INVOKEINTERFACE.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/INVOKEINTERFACE.java deleted file mode 100644 index f2bd72c8..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/INVOKEINTERFACE.java +++ /dev/null @@ -1,138 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; -import org.apache.bcel.ExceptionConst; -import org.apache.bcel.classfile.ConstantPool; -import org.apache.bcel.util.ByteSequence; - -/** - * INVOKEINTERFACE - Invoke interface method - * 
Stack: ..., objectref, [arg1, [arg2 ...]] -> ...
- * - * @see - * - * The invokeinterface instruction in The Java Virtual Machine Specification - */ -public final class INVOKEINTERFACE extends InvokeInstruction { - - private int nargs; // Number of arguments on stack (number of stack slots), called "count" in vmspec2 - - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - INVOKEINTERFACE() { - } - - - public INVOKEINTERFACE(final int index, final int nargs) { - super(Const.INVOKEINTERFACE, index); - super.setLength(5); - if (nargs < 1) { - throw new ClassGenException("Number of arguments must be > 0 " + nargs); - } - this.nargs = nargs; - } - - - /** - * Dump instruction as byte code to stream out. - * @param out Output stream - */ - @Override - public void dump( final DataOutputStream out ) throws IOException { - out.writeByte(super.getOpcode()); - out.writeShort(super.getIndex()); - out.writeByte(nargs); - out.writeByte(0); - } - - - /** - * The count argument according to the Java Language Specification, - * Second Edition. - */ - public int getCount() { - return nargs; - } - - - /** - * Read needed data (i.e., index) from file. - */ - @Override - protected void initFromFile( final ByteSequence bytes, final boolean wide ) throws IOException { - super.initFromFile(bytes, wide); - super.setLength(5); - nargs = bytes.readUnsignedByte(); - bytes.readByte(); // Skip 0 byte - } - - - /** - * @return mnemonic for instruction with symbolic references resolved - */ - @Override - public String toString( final ConstantPool cp ) { - return super.toString(cp) + " " + nargs; - } - - - @Override - public int consumeStack( final ConstantPoolGen cpg ) { // nargs is given in byte-code - return nargs; // nargs includes this reference - } - - - @Override - public Class[] getExceptions() { - return ExceptionConst.createExceptions(ExceptionConst.EXCS.EXCS_INTERFACE_METHOD_RESOLUTION, - ExceptionConst.UNSATISFIED_LINK_ERROR, - ExceptionConst.ABSTRACT_METHOD_ERROR, - ExceptionConst.ILLEGAL_ACCESS_ERROR, - ExceptionConst.INCOMPATIBLE_CLASS_CHANGE_ERROR); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitExceptionThrower(this); - v.visitTypedInstruction(this); - v.visitStackConsumer(this); - v.visitStackProducer(this); - v.visitLoadClass(this); - v.visitCPInstruction(this); - v.visitFieldOrMethod(this); - v.visitInvokeInstruction(this); - v.visitINVOKEINTERFACE(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/INVOKESPECIAL.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/INVOKESPECIAL.java deleted file mode 100644 index e534f225..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/INVOKESPECIAL.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; -import org.apache.bcel.ExceptionConst; - -/** - * INVOKESPECIAL - Invoke instance method; special handling for superclass, private - * and instance initialization method invocations - * - * 
Stack: ..., objectref, [arg1, [arg2 ...]] -> ...
- * - * @see - * - * The invokespecial instruction in The Java Virtual Machine Specification - */ -public class INVOKESPECIAL extends InvokeInstruction { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - INVOKESPECIAL() { - } - - - public INVOKESPECIAL(final int index) { - super(Const.INVOKESPECIAL, index); - } - - - /** - * Dump instruction as byte code to stream out. - * @param out Output stream - */ - @Override - public void dump( final DataOutputStream out ) throws IOException { - out.writeByte(super.getOpcode()); - out.writeShort(super.getIndex()); - } - - @Override - public Class[] getExceptions() { - return ExceptionConst.createExceptions(ExceptionConst.EXCS.EXCS_FIELD_AND_METHOD_RESOLUTION, - ExceptionConst.NULL_POINTER_EXCEPTION, - ExceptionConst.INCOMPATIBLE_CLASS_CHANGE_ERROR, - ExceptionConst.ABSTRACT_METHOD_ERROR, - ExceptionConst.UNSATISFIED_LINK_ERROR); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitExceptionThrower(this); - v.visitTypedInstruction(this); - v.visitStackConsumer(this); - v.visitStackProducer(this); - v.visitLoadClass(this); - v.visitCPInstruction(this); - v.visitFieldOrMethod(this); - v.visitInvokeInstruction(this); - v.visitINVOKESPECIAL(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/INVOKESTATIC.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/INVOKESTATIC.java deleted file mode 100644 index ede3edb2..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/INVOKESTATIC.java +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; -import org.apache.bcel.ExceptionConst; - -/** - * INVOKESTATIC - Invoke a class (static) method - * - * 
Stack: ..., [arg1, [arg2 ...]] -> ...
- * - * @see - * - * The invokestatic instruction in The Java Virtual Machine Specification - */ -public class INVOKESTATIC extends InvokeInstruction { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - INVOKESTATIC() { - } - - - public INVOKESTATIC(final int index) { - super(Const.INVOKESTATIC, index); - } - - - /** - * Dump instruction as byte code to stream out. - * @param out Output stream - */ - @Override - public void dump( final DataOutputStream out ) throws IOException { - out.writeByte(super.getOpcode()); - out.writeShort(super.getIndex()); - } - - @Override - public Class[] getExceptions() { - return ExceptionConst.createExceptions(ExceptionConst.EXCS.EXCS_FIELD_AND_METHOD_RESOLUTION, - ExceptionConst.UNSATISFIED_LINK_ERROR, - ExceptionConst.INCOMPATIBLE_CLASS_CHANGE_ERROR); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitExceptionThrower(this); - v.visitTypedInstruction(this); - v.visitStackConsumer(this); - v.visitStackProducer(this); - v.visitLoadClass(this); - v.visitCPInstruction(this); - v.visitFieldOrMethod(this); - v.visitInvokeInstruction(this); - v.visitINVOKESTATIC(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/INVOKEVIRTUAL.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/INVOKEVIRTUAL.java deleted file mode 100644 index 9370669f..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/INVOKEVIRTUAL.java +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; -import org.apache.bcel.ExceptionConst; - -/** - * INVOKEVIRTUAL - Invoke instance method; dispatch based on class - * - * 
Stack: ..., objectref, [arg1, [arg2 ...]] -> ...
- * - * @see - * - * The invokevirtual instruction in The Java Virtual Machine Specification - */ -public class INVOKEVIRTUAL extends InvokeInstruction { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - INVOKEVIRTUAL() { - } - - - public INVOKEVIRTUAL(final int index) { - super(Const.INVOKEVIRTUAL, index); - } - - - /** - * Dump instruction as byte code to stream out. - * @param out Output stream - */ - @Override - public void dump( final DataOutputStream out ) throws IOException { - out.writeByte(super.getOpcode()); - out.writeShort(super.getIndex()); - } - - @Override - public Class[] getExceptions() { - return ExceptionConst.createExceptions(ExceptionConst.EXCS.EXCS_FIELD_AND_METHOD_RESOLUTION, - ExceptionConst.NULL_POINTER_EXCEPTION, - ExceptionConst.INCOMPATIBLE_CLASS_CHANGE_ERROR, - ExceptionConst.ABSTRACT_METHOD_ERROR, - ExceptionConst.UNSATISFIED_LINK_ERROR); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitExceptionThrower(this); - v.visitTypedInstruction(this); - v.visitStackConsumer(this); - v.visitStackProducer(this); - v.visitLoadClass(this); - v.visitCPInstruction(this); - v.visitFieldOrMethod(this); - v.visitInvokeInstruction(this); - v.visitINVOKEVIRTUAL(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IOR.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IOR.java deleted file mode 100644 index f7cd9f02..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IOR.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * IOR - Bitwise OR int - * 
Stack: ..., value1, value2 -> ..., result
- * - */ -public class IOR extends ArithmeticInstruction { - - public IOR() { - super(org.apache.bcel.Const.IOR); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitArithmeticInstruction(this); - v.visitIOR(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IREM.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IREM.java deleted file mode 100644 index b7ad3eee..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IREM.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import org.apache.bcel.ExceptionConst; - -/** - * IREM - Remainder of int - * 
Stack: ..., value1, value2 -> result
- * - */ -public class IREM extends ArithmeticInstruction implements ExceptionThrower { - - /** Remainder of ints - */ - public IREM() { - super(org.apache.bcel.Const.IREM); - } - - - /** @return exceptions this instruction may cause - */ - @Override - public Class[] getExceptions() { - return new Class[] { - ExceptionConst.ARITHMETIC_EXCEPTION - }; - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitExceptionThrower(this); - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitArithmeticInstruction(this); - v.visitIREM(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IRETURN.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IRETURN.java deleted file mode 100644 index 531ba2c0..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IRETURN.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * IRETURN - Return int from method - * 
Stack: ..., value -> <empty>
- * - */ -public class IRETURN extends ReturnInstruction { - - /** Return int from method - */ - public IRETURN() { - super(org.apache.bcel.Const.IRETURN); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitExceptionThrower(this); - v.visitTypedInstruction(this); - v.visitStackConsumer(this); - v.visitReturnInstruction(this); - v.visitIRETURN(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ISHL.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ISHL.java deleted file mode 100644 index d8358a06..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ISHL.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * ISHL - Arithmetic shift left int - * 
Stack: ..., value1, value2 -> ..., result
- * - */ -public class ISHL extends ArithmeticInstruction { - - public ISHL() { - super(org.apache.bcel.Const.ISHL); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitArithmeticInstruction(this); - v.visitISHL(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ISHR.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ISHR.java deleted file mode 100644 index aed7194c..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ISHR.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * ISHR - Arithmetic shift right int - * 
Stack: ..., value1, value2 -> ..., result
- * - */ -public class ISHR extends ArithmeticInstruction { - - public ISHR() { - super(org.apache.bcel.Const.ISHR); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitArithmeticInstruction(this); - v.visitISHR(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ISTORE.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ISTORE.java deleted file mode 100644 index a303ef2d..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ISTORE.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * ISTORE - Store int from stack into local variable - * 
Stack: ..., value -> ...
- * - */ -public class ISTORE extends StoreInstruction { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - ISTORE() { - super(org.apache.bcel.Const.ISTORE, org.apache.bcel.Const.ISTORE_0); - } - - - /** Store int into local variable - * @param n index of local variable - */ - public ISTORE(final int n) { - super(org.apache.bcel.Const.ISTORE, org.apache.bcel.Const.ISTORE_0, n); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - super.accept(v); - v.visitISTORE(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ISUB.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ISUB.java deleted file mode 100644 index 2a208c64..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ISUB.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * ISUB - Substract ints - * 
Stack: ..., value1, value2 -> result
- * - */ -public class ISUB extends ArithmeticInstruction { - - /** Substract ints - */ - public ISUB() { - super(org.apache.bcel.Const.ISUB); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitArithmeticInstruction(this); - v.visitISUB(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IUSHR.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IUSHR.java deleted file mode 100644 index 75d8568e..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IUSHR.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * IUSHR - Logical shift right int - * 
Stack: ..., value1, value2 -> ..., result
- * - */ -public class IUSHR extends ArithmeticInstruction { - - public IUSHR() { - super(org.apache.bcel.Const.IUSHR); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitArithmeticInstruction(this); - v.visitIUSHR(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IXOR.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IXOR.java deleted file mode 100644 index b4de2113..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IXOR.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * IXOR - Bitwise XOR int - * 
Stack: ..., value1, value2 -> ..., result
- * - */ -public class IXOR extends ArithmeticInstruction { - - public IXOR() { - super(org.apache.bcel.Const.IXOR); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitArithmeticInstruction(this); - v.visitIXOR(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IfInstruction.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IfInstruction.java deleted file mode 100644 index 9ac67462..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IfInstruction.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * Super class for the IFxxx family of instructions. - * - */ -public abstract class IfInstruction extends BranchInstruction implements StackConsumer { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - IfInstruction() { - } - - - /** - * @param opcode opcode of instruction - * @param target Target instruction to branch to - */ - protected IfInstruction(final short opcode, final InstructionHandle target) { - super(opcode, target); - } - - - /** - * @return negation of instruction, e.g. IFEQ.negate() == IFNE - */ - public abstract IfInstruction negate(); -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IndexedInstruction.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IndexedInstruction.java deleted file mode 100644 index 6d0628b8..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/IndexedInstruction.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * Denote entity that refers to an index, e.g. local variable instructions, - * RET, CPInstruction, etc. - * - */ -public interface IndexedInstruction { - - int getIndex(); - - - void setIndex( int index ); -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/Instruction.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/Instruction.java deleted file mode 100644 index 7cdda1e0..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/Instruction.java +++ /dev/null @@ -1,608 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; -import org.apache.bcel.classfile.ConstantPool; -import org.apache.bcel.util.ByteSequence; - -/** - * Abstract super class for all Java byte codes. - * - */ -public abstract class Instruction implements Cloneable { - - /** - * @deprecated (since 6.0) will be made private; do not access directly, use getter/setter - */ - @Deprecated - protected short length = 1; // Length of instruction in bytes - - /** - * @deprecated (since 6.0) will be made private; do not access directly, use getter/setter - */ - @Deprecated - protected short opcode = -1; // Opcode number - - private static InstructionComparator cmp = InstructionComparator.DEFAULT; - - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - Instruction() { - } - - - public Instruction(final short opcode, final short length) { - this.length = length; - this.opcode = opcode; - } - - - /** - * Dump instruction as byte code to stream out. - * @param out Output stream - */ - public void dump( final DataOutputStream out ) throws IOException { - out.writeByte(opcode); // Common for all instructions - } - - - /** @return name of instruction, i.e., opcode name - */ - public String getName() { - return Const.getOpcodeName(opcode); - } - - - /** - * Long output format: - * - * <name of opcode> "["<opcode number>"]" - * "("<length of instruction>")" - * - * @param verbose long/short format switch - * @return mnemonic for instruction - */ - public String toString( final boolean verbose ) { - if (verbose) { - return getName() + "[" + opcode + "](" + length + ")"; - } - return getName(); - } - - - /** - * @return mnemonic for instruction in verbose format - */ - @Override - public String toString() { - return toString(true); - } - - - /** - * @return mnemonic for instruction with sumbolic references resolved - */ - public String toString( final ConstantPool cp ) { - return toString(false); - } - - - /** - * Use with caution, since `BranchInstruction's have a `target' reference which - * is not copied correctly (only basic types are). This also applies for - * `Select' instructions with their multiple branch targets. - * - * @see BranchInstruction - * @return (shallow) copy of an instruction - */ - public Instruction copy() { - Instruction i = null; - // "Constant" instruction, no need to duplicate - if (InstructionConst.getInstruction(this.getOpcode()) != null) { - i = this; - } else { - try { - i = (Instruction) clone(); - } catch (final CloneNotSupportedException e) { - System.err.println(e); - } - } - return i; - } - - - /** - * Read needed data (e.g. index) from file. - * - * @param bytes byte sequence to read from - * @param wide "wide" instruction flag - * @throws IOException may be thrown if the implementation needs to read data from the file - */ - protected void initFromFile( final ByteSequence bytes, final boolean wide ) throws IOException { - } - - - /** - * Read an instruction from (byte code) input stream and return the - * appropiate object. - *

- * If the Instruction is defined in {@link InstructionConst}, then the - * singleton instance is returned. - * @param bytes input stream bytes - * @return instruction object being read - * @see InstructionConst#getInstruction(int) - */ - // @since 6.0 no longer final - public static Instruction readInstruction( final ByteSequence bytes ) throws IOException { - boolean wide = false; - short opcode = (short) bytes.readUnsignedByte(); - Instruction obj = null; - if (opcode == Const.WIDE) { // Read next opcode after wide byte - wide = true; - opcode = (short) bytes.readUnsignedByte(); - } - final Instruction instruction = InstructionConst.getInstruction(opcode); - if (instruction != null) { - return instruction; // Used predefined immutable object, if available - } - - switch (opcode) { - case Const.BIPUSH: - obj = new BIPUSH(); - break; - case Const.SIPUSH: - obj = new SIPUSH(); - break; - case Const.LDC: - obj = new LDC(); - break; - case Const.LDC_W: - obj = new LDC_W(); - break; - case Const.LDC2_W: - obj = new LDC2_W(); - break; - case Const.ILOAD: - obj = new ILOAD(); - break; - case Const.LLOAD: - obj = new LLOAD(); - break; - case Const.FLOAD: - obj = new FLOAD(); - break; - case Const.DLOAD: - obj = new DLOAD(); - break; - case Const.ALOAD: - obj = new ALOAD(); - break; - case Const.ILOAD_0: - obj = new ILOAD(0); - break; - case Const.ILOAD_1: - obj = new ILOAD(1); - break; - case Const.ILOAD_2: - obj = new ILOAD(2); - break; - case Const.ILOAD_3: - obj = new ILOAD(3); - break; - case Const.LLOAD_0: - obj = new LLOAD(0); - break; - case Const.LLOAD_1: - obj = new LLOAD(1); - break; - case Const.LLOAD_2: - obj = new LLOAD(2); - break; - case Const.LLOAD_3: - obj = new LLOAD(3); - break; - case Const.FLOAD_0: - obj = new FLOAD(0); - break; - case Const.FLOAD_1: - obj = new FLOAD(1); - break; - case Const.FLOAD_2: - obj = new FLOAD(2); - break; - case Const.FLOAD_3: - obj = new FLOAD(3); - break; - case Const.DLOAD_0: - obj = new DLOAD(0); - break; - case Const.DLOAD_1: - obj = new DLOAD(1); - break; - case Const.DLOAD_2: - obj = new DLOAD(2); - break; - case Const.DLOAD_3: - obj = new DLOAD(3); - break; - case Const.ALOAD_0: - obj = new ALOAD(0); - break; - case Const.ALOAD_1: - obj = new ALOAD(1); - break; - case Const.ALOAD_2: - obj = new ALOAD(2); - break; - case Const.ALOAD_3: - obj = new ALOAD(3); - break; - case Const.ISTORE: - obj = new ISTORE(); - break; - case Const.LSTORE: - obj = new LSTORE(); - break; - case Const.FSTORE: - obj = new FSTORE(); - break; - case Const.DSTORE: - obj = new DSTORE(); - break; - case Const.ASTORE: - obj = new ASTORE(); - break; - case Const.ISTORE_0: - obj = new ISTORE(0); - break; - case Const.ISTORE_1: - obj = new ISTORE(1); - break; - case Const.ISTORE_2: - obj = new ISTORE(2); - break; - case Const.ISTORE_3: - obj = new ISTORE(3); - break; - case Const.LSTORE_0: - obj = new LSTORE(0); - break; - case Const.LSTORE_1: - obj = new LSTORE(1); - break; - case Const.LSTORE_2: - obj = new LSTORE(2); - break; - case Const.LSTORE_3: - obj = new LSTORE(3); - break; - case Const.FSTORE_0: - obj = new FSTORE(0); - break; - case Const.FSTORE_1: - obj = new FSTORE(1); - break; - case Const.FSTORE_2: - obj = new FSTORE(2); - break; - case Const.FSTORE_3: - obj = new FSTORE(3); - break; - case Const.DSTORE_0: - obj = new DSTORE(0); - break; - case Const.DSTORE_1: - obj = new DSTORE(1); - break; - case Const.DSTORE_2: - obj = new DSTORE(2); - break; - case Const.DSTORE_3: - obj = new DSTORE(3); - break; - case Const.ASTORE_0: - obj = new ASTORE(0); - break; - case Const.ASTORE_1: - obj = new ASTORE(1); - break; - case Const.ASTORE_2: - obj = new ASTORE(2); - break; - case Const.ASTORE_3: - obj = new ASTORE(3); - break; - case Const.IINC: - obj = new IINC(); - break; - case Const.IFEQ: - obj = new IFEQ(); - break; - case Const.IFNE: - obj = new IFNE(); - break; - case Const.IFLT: - obj = new IFLT(); - break; - case Const.IFGE: - obj = new IFGE(); - break; - case Const.IFGT: - obj = new IFGT(); - break; - case Const.IFLE: - obj = new IFLE(); - break; - case Const.IF_ICMPEQ: - obj = new IF_ICMPEQ(); - break; - case Const.IF_ICMPNE: - obj = new IF_ICMPNE(); - break; - case Const.IF_ICMPLT: - obj = new IF_ICMPLT(); - break; - case Const.IF_ICMPGE: - obj = new IF_ICMPGE(); - break; - case Const.IF_ICMPGT: - obj = new IF_ICMPGT(); - break; - case Const.IF_ICMPLE: - obj = new IF_ICMPLE(); - break; - case Const.IF_ACMPEQ: - obj = new IF_ACMPEQ(); - break; - case Const.IF_ACMPNE: - obj = new IF_ACMPNE(); - break; - case Const.GOTO: - obj = new GOTO(); - break; - case Const.JSR: - obj = new JSR(); - break; - case Const.RET: - obj = new RET(); - break; - case Const.TABLESWITCH: - obj = new TABLESWITCH(); - break; - case Const.LOOKUPSWITCH: - obj = new LOOKUPSWITCH(); - break; - case Const.GETSTATIC: - obj = new GETSTATIC(); - break; - case Const.PUTSTATIC: - obj = new PUTSTATIC(); - break; - case Const.GETFIELD: - obj = new GETFIELD(); - break; - case Const.PUTFIELD: - obj = new PUTFIELD(); - break; - case Const.INVOKEVIRTUAL: - obj = new INVOKEVIRTUAL(); - break; - case Const.INVOKESPECIAL: - obj = new INVOKESPECIAL(); - break; - case Const.INVOKESTATIC: - obj = new INVOKESTATIC(); - break; - case Const.INVOKEINTERFACE: - obj = new INVOKEINTERFACE(); - break; - case Const.INVOKEDYNAMIC: - obj = new INVOKEDYNAMIC(); - break; - case Const.NEW: - obj = new NEW(); - break; - case Const.NEWARRAY: - obj = new NEWARRAY(); - break; - case Const.ANEWARRAY: - obj = new ANEWARRAY(); - break; - case Const.CHECKCAST: - obj = new CHECKCAST(); - break; - case Const.INSTANCEOF: - obj = new INSTANCEOF(); - break; - case Const.MULTIANEWARRAY: - obj = new MULTIANEWARRAY(); - break; - case Const.IFNULL: - obj = new IFNULL(); - break; - case Const.IFNONNULL: - obj = new IFNONNULL(); - break; - case Const.GOTO_W: - obj = new GOTO_W(); - break; - case Const.JSR_W: - obj = new JSR_W(); - break; - case Const.BREAKPOINT: - obj = new BREAKPOINT(); - break; - case Const.IMPDEP1: - obj = new IMPDEP1(); - break; - case Const.IMPDEP2: - obj = new IMPDEP2(); - break; - default: - throw new ClassGenException("Illegal opcode detected: " + opcode); - - } - - if (wide - && !((obj instanceof LocalVariableInstruction) || (obj instanceof IINC) || (obj instanceof RET))) { - throw new ClassGenException("Illegal opcode after wide: " + opcode); - } - obj.setOpcode(opcode); - obj.initFromFile(bytes, wide); // Do further initializations, if any - return obj; - } - - /** - * This method also gives right results for instructions whose - * effect on the stack depends on the constant pool entry they - * reference. - * @return Number of words consumed from stack by this instruction, - * or Constants.UNPREDICTABLE, if this can not be computed statically - */ - public int consumeStack( final ConstantPoolGen cpg ) { - return Const.getConsumeStack(opcode); - } - - - /** - * This method also gives right results for instructions whose - * effect on the stack depends on the constant pool entry they - * reference. - * @return Number of words produced onto stack by this instruction, - * or Constants.UNPREDICTABLE, if this can not be computed statically - */ - public int produceStack( final ConstantPoolGen cpg ) { - return Const.getProduceStack(opcode); - } - - - /** - * @return this instructions opcode - */ - public short getOpcode() { - return opcode; - } - - - /** - * @return length (in bytes) of instruction - */ - public int getLength() { - return length; - } - - - /** - * Needed in readInstruction and subclasses in this package - */ - final void setOpcode( final short opcode ) { - this.opcode = opcode; - } - - - /** - * Needed in readInstruction and subclasses in this package - * @since 6.0 - */ - final void setLength( final int length ) { - this.length = (short) length; // TODO check range? - } - - - /** Some instructions may be reused, so don't do anything by default. - */ - void dispose() { - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - public abstract void accept( Visitor v ); - - - /** Get Comparator object used in the equals() method to determine - * equality of instructions. - * - * @return currently used comparator for equals() - * @deprecated (6.0) use the built in comparator, or wrap this class in another object that implements these methods - */ - @Deprecated - public static InstructionComparator getComparator() { - return cmp; - } - - - /** Set comparator to be used for equals(). - * @deprecated (6.0) use the built in comparator, or wrap this class in another object that implements these methods - */ - @Deprecated - public static void setComparator( final InstructionComparator c ) { - cmp = c; - } - - - /** Check for equality, delegated to comparator - * @return true if that is an Instruction and has the same opcode - */ - @Override - public boolean equals( final Object that ) { - return (that instanceof Instruction) ? cmp.equals(this, (Instruction) that) : false; - } - - /** calculate the hashCode of this object - * @return the hashCode - * @since 6.0 - */ - @Override - public int hashCode() { - return opcode; - } - - /** - * Check if the value can fit in a byte (signed) - * @param value the value to check - * @return true if the value is in range - * @since 6.0 - */ - public static boolean isValidByte(final int value) { - return value >= Byte.MIN_VALUE && value <= Byte.MAX_VALUE; - } - - /** - * Check if the value can fit in a short (signed) - * @param value the value to check - * @return true if the value is in range - * @since 6.0 - */ - public static boolean isValidShort(final int value) { - return value >= Short.MIN_VALUE && value <= Short.MAX_VALUE; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/InstructionComparator.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/InstructionComparator.java deleted file mode 100644 index a31e55a9..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/InstructionComparator.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * Equality of instructions isn't clearly to be defined. You might - * wish, for example, to compare whether instructions have the same - * meaning. E.g., whether two INVOKEVIRTUALs describe the same - * call. - *

- * The DEFAULT comparator however, considers two instructions - * to be equal if they have same opcode and point to the same indexes - * (if any) in the constant pool or the same local variable index. Branch - * instructions must have the same target. - *

- * - * @see Instruction - */ -public interface InstructionComparator { - - InstructionComparator DEFAULT = (i1, i2) -> { - if (i1.getOpcode() == i2.getOpcode()) { - if (i1 instanceof BranchInstruction) { - // BIs are never equal to make targeters work correctly (BCEL-195) - return false; -// } else if (i1 == i2) { TODO consider adding this shortcut -// return true; // this must be AFTER the BI test - } else if (i1 instanceof ConstantPushInstruction) { - return ((ConstantPushInstruction) i1).getValue().equals( - ((ConstantPushInstruction) i2).getValue()); - } else if (i1 instanceof IndexedInstruction) { - return ((IndexedInstruction) i1).getIndex() == ((IndexedInstruction) i2) - .getIndex(); - } else if (i1 instanceof NEWARRAY) { - return ((NEWARRAY) i1).getTypecode() == ((NEWARRAY) i2).getTypecode(); - } else { - return true; - } - } - return false; - }; - - - boolean equals( Instruction i1, Instruction i2 ); -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/InstructionConst.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/InstructionConst.java deleted file mode 100644 index d231cae3..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/InstructionConst.java +++ /dev/null @@ -1,296 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import org.apache.bcel.Const; - -/** - * This interface contains shareable instruction objects. - * - * In order to save memory you can use some instructions multiply, - * since they have an immutable state and are directly derived from - * Instruction. I.e. they have no instance fields that could be - * changed. Since some of these instructions like ICONST_0 occur - * very frequently this can save a lot of time and space. This - * feature is an adaptation of the FlyWeight design pattern, we - * just use an array instead of a factory. - * - * The Instructions can also accessed directly under their names, so - * it's possible to write il.append(Instruction.ICONST_0); - * - */ -public final class InstructionConst { - - /** - * Predefined instruction objects - */ - /* - * NOTE these are not currently immutable, because Instruction - * has mutable protected fields opcode and length. - */ - public static final Instruction NOP = new NOP(); - public static final Instruction ACONST_NULL = new ACONST_NULL(); - public static final Instruction ICONST_M1 = new ICONST(-1); - public static final Instruction ICONST_0 = new ICONST(0); - public static final Instruction ICONST_1 = new ICONST(1); - public static final Instruction ICONST_2 = new ICONST(2); - public static final Instruction ICONST_3 = new ICONST(3); - public static final Instruction ICONST_4 = new ICONST(4); - public static final Instruction ICONST_5 = new ICONST(5); - public static final Instruction LCONST_0 = new LCONST(0); - public static final Instruction LCONST_1 = new LCONST(1); - public static final Instruction FCONST_0 = new FCONST(0); - public static final Instruction FCONST_1 = new FCONST(1); - public static final Instruction FCONST_2 = new FCONST(2); - public static final Instruction DCONST_0 = new DCONST(0); - public static final Instruction DCONST_1 = new DCONST(1); - public static final ArrayInstruction IALOAD = new IALOAD(); - public static final ArrayInstruction LALOAD = new LALOAD(); - public static final ArrayInstruction FALOAD = new FALOAD(); - public static final ArrayInstruction DALOAD = new DALOAD(); - public static final ArrayInstruction AALOAD = new AALOAD(); - public static final ArrayInstruction BALOAD = new BALOAD(); - public static final ArrayInstruction CALOAD = new CALOAD(); - public static final ArrayInstruction SALOAD = new SALOAD(); - public static final ArrayInstruction IASTORE = new IASTORE(); - public static final ArrayInstruction LASTORE = new LASTORE(); - public static final ArrayInstruction FASTORE = new FASTORE(); - public static final ArrayInstruction DASTORE = new DASTORE(); - public static final ArrayInstruction AASTORE = new AASTORE(); - public static final ArrayInstruction BASTORE = new BASTORE(); - public static final ArrayInstruction CASTORE = new CASTORE(); - public static final ArrayInstruction SASTORE = new SASTORE(); - public static final StackInstruction POP = new POP(); - public static final StackInstruction POP2 = new POP2(); - public static final StackInstruction DUP = new DUP(); - public static final StackInstruction DUP_X1 = new DUP_X1(); - public static final StackInstruction DUP_X2 = new DUP_X2(); - public static final StackInstruction DUP2 = new DUP2(); - public static final StackInstruction DUP2_X1 = new DUP2_X1(); - public static final StackInstruction DUP2_X2 = new DUP2_X2(); - public static final StackInstruction SWAP = new SWAP(); - public static final ArithmeticInstruction IADD = new IADD(); - public static final ArithmeticInstruction LADD = new LADD(); - public static final ArithmeticInstruction FADD = new FADD(); - public static final ArithmeticInstruction DADD = new DADD(); - public static final ArithmeticInstruction ISUB = new ISUB(); - public static final ArithmeticInstruction LSUB = new LSUB(); - public static final ArithmeticInstruction FSUB = new FSUB(); - public static final ArithmeticInstruction DSUB = new DSUB(); - public static final ArithmeticInstruction IMUL = new IMUL(); - public static final ArithmeticInstruction LMUL = new LMUL(); - public static final ArithmeticInstruction FMUL = new FMUL(); - public static final ArithmeticInstruction DMUL = new DMUL(); - public static final ArithmeticInstruction IDIV = new IDIV(); - public static final ArithmeticInstruction LDIV = new LDIV(); - public static final ArithmeticInstruction FDIV = new FDIV(); - public static final ArithmeticInstruction DDIV = new DDIV(); - public static final ArithmeticInstruction IREM = new IREM(); - public static final ArithmeticInstruction LREM = new LREM(); - public static final ArithmeticInstruction FREM = new FREM(); - public static final ArithmeticInstruction DREM = new DREM(); - public static final ArithmeticInstruction INEG = new INEG(); - public static final ArithmeticInstruction LNEG = new LNEG(); - public static final ArithmeticInstruction FNEG = new FNEG(); - public static final ArithmeticInstruction DNEG = new DNEG(); - public static final ArithmeticInstruction ISHL = new ISHL(); - public static final ArithmeticInstruction LSHL = new LSHL(); - public static final ArithmeticInstruction ISHR = new ISHR(); - public static final ArithmeticInstruction LSHR = new LSHR(); - public static final ArithmeticInstruction IUSHR = new IUSHR(); - public static final ArithmeticInstruction LUSHR = new LUSHR(); - public static final ArithmeticInstruction IAND = new IAND(); - public static final ArithmeticInstruction LAND = new LAND(); - public static final ArithmeticInstruction IOR = new IOR(); - public static final ArithmeticInstruction LOR = new LOR(); - public static final ArithmeticInstruction IXOR = new IXOR(); - public static final ArithmeticInstruction LXOR = new LXOR(); - public static final ConversionInstruction I2L = new I2L(); - public static final ConversionInstruction I2F = new I2F(); - public static final ConversionInstruction I2D = new I2D(); - public static final ConversionInstruction L2I = new L2I(); - public static final ConversionInstruction L2F = new L2F(); - public static final ConversionInstruction L2D = new L2D(); - public static final ConversionInstruction F2I = new F2I(); - public static final ConversionInstruction F2L = new F2L(); - public static final ConversionInstruction F2D = new F2D(); - public static final ConversionInstruction D2I = new D2I(); - public static final ConversionInstruction D2L = new D2L(); - public static final ConversionInstruction D2F = new D2F(); - public static final ConversionInstruction I2B = new I2B(); - public static final ConversionInstruction I2C = new I2C(); - public static final ConversionInstruction I2S = new I2S(); - public static final Instruction LCMP = new LCMP(); - public static final Instruction FCMPL = new FCMPL(); - public static final Instruction FCMPG = new FCMPG(); - public static final Instruction DCMPL = new DCMPL(); - public static final Instruction DCMPG = new DCMPG(); - public static final ReturnInstruction IRETURN = new IRETURN(); - public static final ReturnInstruction LRETURN = new LRETURN(); - public static final ReturnInstruction FRETURN = new FRETURN(); - public static final ReturnInstruction DRETURN = new DRETURN(); - public static final ReturnInstruction ARETURN = new ARETURN(); - public static final ReturnInstruction RETURN = new RETURN(); - public static final Instruction ARRAYLENGTH = new ARRAYLENGTH(); - public static final Instruction ATHROW = new ATHROW(); - public static final Instruction MONITORENTER = new MONITORENTER(); - public static final Instruction MONITOREXIT = new MONITOREXIT(); - - /** You can use these constants in multiple places safely, if you can guarantee - * that you will never alter their internal values, e.g. call setIndex(). - */ - public static final LocalVariableInstruction THIS = new ALOAD(0); - public static final LocalVariableInstruction ALOAD_0 = THIS; - public static final LocalVariableInstruction ALOAD_1 = new ALOAD(1); - public static final LocalVariableInstruction ALOAD_2 = new ALOAD(2); - public static final LocalVariableInstruction ILOAD_0 = new ILOAD(0); - public static final LocalVariableInstruction ILOAD_1 = new ILOAD(1); - public static final LocalVariableInstruction ILOAD_2 = new ILOAD(2); - public static final LocalVariableInstruction ASTORE_0 = new ASTORE(0); - public static final LocalVariableInstruction ASTORE_1 = new ASTORE(1); - public static final LocalVariableInstruction ASTORE_2 = new ASTORE(2); - public static final LocalVariableInstruction ISTORE_0 = new ISTORE(0); - public static final LocalVariableInstruction ISTORE_1 = new ISTORE(1); - public static final LocalVariableInstruction ISTORE_2 = new ISTORE(2); - - /** Get object via its opcode, for immutable instructions like - * branch instructions entries are set to null. - */ - private static final Instruction[] INSTRUCTIONS = new Instruction[256]; - - static { - INSTRUCTIONS[Const.NOP] = NOP; - INSTRUCTIONS[Const.ACONST_NULL] = ACONST_NULL; - INSTRUCTIONS[Const.ICONST_M1] = ICONST_M1; - INSTRUCTIONS[Const.ICONST_0] = ICONST_0; - INSTRUCTIONS[Const.ICONST_1] = ICONST_1; - INSTRUCTIONS[Const.ICONST_2] = ICONST_2; - INSTRUCTIONS[Const.ICONST_3] = ICONST_3; - INSTRUCTIONS[Const.ICONST_4] = ICONST_4; - INSTRUCTIONS[Const.ICONST_5] = ICONST_5; - INSTRUCTIONS[Const.LCONST_0] = LCONST_0; - INSTRUCTIONS[Const.LCONST_1] = LCONST_1; - INSTRUCTIONS[Const.FCONST_0] = FCONST_0; - INSTRUCTIONS[Const.FCONST_1] = FCONST_1; - INSTRUCTIONS[Const.FCONST_2] = FCONST_2; - INSTRUCTIONS[Const.DCONST_0] = DCONST_0; - INSTRUCTIONS[Const.DCONST_1] = DCONST_1; - INSTRUCTIONS[Const.IALOAD] = IALOAD; - INSTRUCTIONS[Const.LALOAD] = LALOAD; - INSTRUCTIONS[Const.FALOAD] = FALOAD; - INSTRUCTIONS[Const.DALOAD] = DALOAD; - INSTRUCTIONS[Const.AALOAD] = AALOAD; - INSTRUCTIONS[Const.BALOAD] = BALOAD; - INSTRUCTIONS[Const.CALOAD] = CALOAD; - INSTRUCTIONS[Const.SALOAD] = SALOAD; - INSTRUCTIONS[Const.IASTORE] = IASTORE; - INSTRUCTIONS[Const.LASTORE] = LASTORE; - INSTRUCTIONS[Const.FASTORE] = FASTORE; - INSTRUCTIONS[Const.DASTORE] = DASTORE; - INSTRUCTIONS[Const.AASTORE] = AASTORE; - INSTRUCTIONS[Const.BASTORE] = BASTORE; - INSTRUCTIONS[Const.CASTORE] = CASTORE; - INSTRUCTIONS[Const.SASTORE] = SASTORE; - INSTRUCTIONS[Const.POP] = POP; - INSTRUCTIONS[Const.POP2] = POP2; - INSTRUCTIONS[Const.DUP] = DUP; - INSTRUCTIONS[Const.DUP_X1] = DUP_X1; - INSTRUCTIONS[Const.DUP_X2] = DUP_X2; - INSTRUCTIONS[Const.DUP2] = DUP2; - INSTRUCTIONS[Const.DUP2_X1] = DUP2_X1; - INSTRUCTIONS[Const.DUP2_X2] = DUP2_X2; - INSTRUCTIONS[Const.SWAP] = SWAP; - INSTRUCTIONS[Const.IADD] = IADD; - INSTRUCTIONS[Const.LADD] = LADD; - INSTRUCTIONS[Const.FADD] = FADD; - INSTRUCTIONS[Const.DADD] = DADD; - INSTRUCTIONS[Const.ISUB] = ISUB; - INSTRUCTIONS[Const.LSUB] = LSUB; - INSTRUCTIONS[Const.FSUB] = FSUB; - INSTRUCTIONS[Const.DSUB] = DSUB; - INSTRUCTIONS[Const.IMUL] = IMUL; - INSTRUCTIONS[Const.LMUL] = LMUL; - INSTRUCTIONS[Const.FMUL] = FMUL; - INSTRUCTIONS[Const.DMUL] = DMUL; - INSTRUCTIONS[Const.IDIV] = IDIV; - INSTRUCTIONS[Const.LDIV] = LDIV; - INSTRUCTIONS[Const.FDIV] = FDIV; - INSTRUCTIONS[Const.DDIV] = DDIV; - INSTRUCTIONS[Const.IREM] = IREM; - INSTRUCTIONS[Const.LREM] = LREM; - INSTRUCTIONS[Const.FREM] = FREM; - INSTRUCTIONS[Const.DREM] = DREM; - INSTRUCTIONS[Const.INEG] = INEG; - INSTRUCTIONS[Const.LNEG] = LNEG; - INSTRUCTIONS[Const.FNEG] = FNEG; - INSTRUCTIONS[Const.DNEG] = DNEG; - INSTRUCTIONS[Const.ISHL] = ISHL; - INSTRUCTIONS[Const.LSHL] = LSHL; - INSTRUCTIONS[Const.ISHR] = ISHR; - INSTRUCTIONS[Const.LSHR] = LSHR; - INSTRUCTIONS[Const.IUSHR] = IUSHR; - INSTRUCTIONS[Const.LUSHR] = LUSHR; - INSTRUCTIONS[Const.IAND] = IAND; - INSTRUCTIONS[Const.LAND] = LAND; - INSTRUCTIONS[Const.IOR] = IOR; - INSTRUCTIONS[Const.LOR] = LOR; - INSTRUCTIONS[Const.IXOR] = IXOR; - INSTRUCTIONS[Const.LXOR] = LXOR; - INSTRUCTIONS[Const.I2L] = I2L; - INSTRUCTIONS[Const.I2F] = I2F; - INSTRUCTIONS[Const.I2D] = I2D; - INSTRUCTIONS[Const.L2I] = L2I; - INSTRUCTIONS[Const.L2F] = L2F; - INSTRUCTIONS[Const.L2D] = L2D; - INSTRUCTIONS[Const.F2I] = F2I; - INSTRUCTIONS[Const.F2L] = F2L; - INSTRUCTIONS[Const.F2D] = F2D; - INSTRUCTIONS[Const.D2I] = D2I; - INSTRUCTIONS[Const.D2L] = D2L; - INSTRUCTIONS[Const.D2F] = D2F; - INSTRUCTIONS[Const.I2B] = I2B; - INSTRUCTIONS[Const.I2C] = I2C; - INSTRUCTIONS[Const.I2S] = I2S; - INSTRUCTIONS[Const.LCMP] = LCMP; - INSTRUCTIONS[Const.FCMPL] = FCMPL; - INSTRUCTIONS[Const.FCMPG] = FCMPG; - INSTRUCTIONS[Const.DCMPL] = DCMPL; - INSTRUCTIONS[Const.DCMPG] = DCMPG; - INSTRUCTIONS[Const.IRETURN] = IRETURN; - INSTRUCTIONS[Const.LRETURN] = LRETURN; - INSTRUCTIONS[Const.FRETURN] = FRETURN; - INSTRUCTIONS[Const.DRETURN] = DRETURN; - INSTRUCTIONS[Const.ARETURN] = ARETURN; - INSTRUCTIONS[Const.RETURN] = RETURN; - INSTRUCTIONS[Const.ARRAYLENGTH] = ARRAYLENGTH; - INSTRUCTIONS[Const.ATHROW] = ATHROW; - INSTRUCTIONS[Const.MONITORENTER] = MONITORENTER; - INSTRUCTIONS[Const.MONITOREXIT] = MONITOREXIT; - } - - private InstructionConst() { } // non-instantiable - - /** - * Gets the Instruction. - * @param index the index, e.g. {@link Const#RETURN} - * @return the entry from the private INSTRUCTIONS table - */ - public static Instruction getInstruction(final int index) { - return INSTRUCTIONS[index]; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/InstructionConstants.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/InstructionConstants.java deleted file mode 100644 index 06165c27..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/InstructionConstants.java +++ /dev/null @@ -1,291 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import org.apache.bcel.Const; - -/** - * This interface contains shareable instruction objects. - * - * In order to save memory you can use some instructions multiply, - * since they have an immutable state and are directly derived from - * Instruction. I.e. they have no instance fields that could be - * changed. Since some of these instructions like ICONST_0 occur - * very frequently this can save a lot of time and space. This - * feature is an adaptation of the FlyWeight design pattern, we - * just use an array instead of a factory. - * - * The Instructions can also accessed directly under their names, so - * it's possible to write il.append(Instruction.ICONST_0); - * - * @deprecated (since 6.0) Do not use. Use InstructionConst instead. - */ -@Deprecated -public interface InstructionConstants { - - /** Predefined instruction objects - */ - /* - * NOTE these are not currently immutable, because Instruction - * has mutable protected fields opcode and length. - */ - Instruction NOP = new NOP(); - Instruction ACONST_NULL = new ACONST_NULL(); - Instruction ICONST_M1 = new ICONST(-1); - Instruction ICONST_0 = new ICONST(0); - Instruction ICONST_1 = new ICONST(1); - Instruction ICONST_2 = new ICONST(2); - Instruction ICONST_3 = new ICONST(3); - Instruction ICONST_4 = new ICONST(4); - Instruction ICONST_5 = new ICONST(5); - Instruction LCONST_0 = new LCONST(0); - Instruction LCONST_1 = new LCONST(1); - Instruction FCONST_0 = new FCONST(0); - Instruction FCONST_1 = new FCONST(1); - Instruction FCONST_2 = new FCONST(2); - Instruction DCONST_0 = new DCONST(0); - Instruction DCONST_1 = new DCONST(1); - ArrayInstruction IALOAD = new IALOAD(); - ArrayInstruction LALOAD = new LALOAD(); - ArrayInstruction FALOAD = new FALOAD(); - ArrayInstruction DALOAD = new DALOAD(); - ArrayInstruction AALOAD = new AALOAD(); - ArrayInstruction BALOAD = new BALOAD(); - ArrayInstruction CALOAD = new CALOAD(); - ArrayInstruction SALOAD = new SALOAD(); - ArrayInstruction IASTORE = new IASTORE(); - ArrayInstruction LASTORE = new LASTORE(); - ArrayInstruction FASTORE = new FASTORE(); - ArrayInstruction DASTORE = new DASTORE(); - ArrayInstruction AASTORE = new AASTORE(); - ArrayInstruction BASTORE = new BASTORE(); - ArrayInstruction CASTORE = new CASTORE(); - ArrayInstruction SASTORE = new SASTORE(); - StackInstruction POP = new POP(); - StackInstruction POP2 = new POP2(); - StackInstruction DUP = new DUP(); - StackInstruction DUP_X1 = new DUP_X1(); - StackInstruction DUP_X2 = new DUP_X2(); - StackInstruction DUP2 = new DUP2(); - StackInstruction DUP2_X1 = new DUP2_X1(); - StackInstruction DUP2_X2 = new DUP2_X2(); - StackInstruction SWAP = new SWAP(); - ArithmeticInstruction IADD = new IADD(); - ArithmeticInstruction LADD = new LADD(); - ArithmeticInstruction FADD = new FADD(); - ArithmeticInstruction DADD = new DADD(); - ArithmeticInstruction ISUB = new ISUB(); - ArithmeticInstruction LSUB = new LSUB(); - ArithmeticInstruction FSUB = new FSUB(); - ArithmeticInstruction DSUB = new DSUB(); - ArithmeticInstruction IMUL = new IMUL(); - ArithmeticInstruction LMUL = new LMUL(); - ArithmeticInstruction FMUL = new FMUL(); - ArithmeticInstruction DMUL = new DMUL(); - ArithmeticInstruction IDIV = new IDIV(); - ArithmeticInstruction LDIV = new LDIV(); - ArithmeticInstruction FDIV = new FDIV(); - ArithmeticInstruction DDIV = new DDIV(); - ArithmeticInstruction IREM = new IREM(); - ArithmeticInstruction LREM = new LREM(); - ArithmeticInstruction FREM = new FREM(); - ArithmeticInstruction DREM = new DREM(); - ArithmeticInstruction INEG = new INEG(); - ArithmeticInstruction LNEG = new LNEG(); - ArithmeticInstruction FNEG = new FNEG(); - ArithmeticInstruction DNEG = new DNEG(); - ArithmeticInstruction ISHL = new ISHL(); - ArithmeticInstruction LSHL = new LSHL(); - ArithmeticInstruction ISHR = new ISHR(); - ArithmeticInstruction LSHR = new LSHR(); - ArithmeticInstruction IUSHR = new IUSHR(); - ArithmeticInstruction LUSHR = new LUSHR(); - ArithmeticInstruction IAND = new IAND(); - ArithmeticInstruction LAND = new LAND(); - ArithmeticInstruction IOR = new IOR(); - ArithmeticInstruction LOR = new LOR(); - ArithmeticInstruction IXOR = new IXOR(); - ArithmeticInstruction LXOR = new LXOR(); - ConversionInstruction I2L = new I2L(); - ConversionInstruction I2F = new I2F(); - ConversionInstruction I2D = new I2D(); - ConversionInstruction L2I = new L2I(); - ConversionInstruction L2F = new L2F(); - ConversionInstruction L2D = new L2D(); - ConversionInstruction F2I = new F2I(); - ConversionInstruction F2L = new F2L(); - ConversionInstruction F2D = new F2D(); - ConversionInstruction D2I = new D2I(); - ConversionInstruction D2L = new D2L(); - ConversionInstruction D2F = new D2F(); - ConversionInstruction I2B = new I2B(); - ConversionInstruction I2C = new I2C(); - ConversionInstruction I2S = new I2S(); - Instruction LCMP = new LCMP(); - Instruction FCMPL = new FCMPL(); - Instruction FCMPG = new FCMPG(); - Instruction DCMPL = new DCMPL(); - Instruction DCMPG = new DCMPG(); - ReturnInstruction IRETURN = new IRETURN(); - ReturnInstruction LRETURN = new LRETURN(); - ReturnInstruction FRETURN = new FRETURN(); - ReturnInstruction DRETURN = new DRETURN(); - ReturnInstruction ARETURN = new ARETURN(); - ReturnInstruction RETURN = new RETURN(); - Instruction ARRAYLENGTH = new ARRAYLENGTH(); - Instruction ATHROW = new ATHROW(); - Instruction MONITORENTER = new MONITORENTER(); - Instruction MONITOREXIT = new MONITOREXIT(); - /** You can use these constants in multiple places safely, if you can guarantee - * that you will never alter their internal values, e.g. call setIndex(). - */ - LocalVariableInstruction THIS = new ALOAD(0); - LocalVariableInstruction ALOAD_0 = THIS; - LocalVariableInstruction ALOAD_1 = new ALOAD(1); - LocalVariableInstruction ALOAD_2 = new ALOAD(2); - LocalVariableInstruction ILOAD_0 = new ILOAD(0); - LocalVariableInstruction ILOAD_1 = new ILOAD(1); - LocalVariableInstruction ILOAD_2 = new ILOAD(2); - LocalVariableInstruction ASTORE_0 = new ASTORE(0); - LocalVariableInstruction ASTORE_1 = new ASTORE(1); - LocalVariableInstruction ASTORE_2 = new ASTORE(2); - LocalVariableInstruction ISTORE_0 = new ISTORE(0); - LocalVariableInstruction ISTORE_1 = new ISTORE(1); - LocalVariableInstruction ISTORE_2 = new ISTORE(2); - /** Get object via its opcode, for immutable instructions like - * branch instructions entries are set to null. - */ - Instruction[] INSTRUCTIONS = new Instruction[256]; - /** Interfaces may have no static initializers, so we simulate this - * with an inner class. - */ - Clinit bla = new Clinit(); - - class Clinit { - - Clinit() { - INSTRUCTIONS[Const.NOP] = NOP; - INSTRUCTIONS[Const.ACONST_NULL] = ACONST_NULL; - INSTRUCTIONS[Const.ICONST_M1] = ICONST_M1; - INSTRUCTIONS[Const.ICONST_0] = ICONST_0; - INSTRUCTIONS[Const.ICONST_1] = ICONST_1; - INSTRUCTIONS[Const.ICONST_2] = ICONST_2; - INSTRUCTIONS[Const.ICONST_3] = ICONST_3; - INSTRUCTIONS[Const.ICONST_4] = ICONST_4; - INSTRUCTIONS[Const.ICONST_5] = ICONST_5; - INSTRUCTIONS[Const.LCONST_0] = LCONST_0; - INSTRUCTIONS[Const.LCONST_1] = LCONST_1; - INSTRUCTIONS[Const.FCONST_0] = FCONST_0; - INSTRUCTIONS[Const.FCONST_1] = FCONST_1; - INSTRUCTIONS[Const.FCONST_2] = FCONST_2; - INSTRUCTIONS[Const.DCONST_0] = DCONST_0; - INSTRUCTIONS[Const.DCONST_1] = DCONST_1; - INSTRUCTIONS[Const.IALOAD] = IALOAD; - INSTRUCTIONS[Const.LALOAD] = LALOAD; - INSTRUCTIONS[Const.FALOAD] = FALOAD; - INSTRUCTIONS[Const.DALOAD] = DALOAD; - INSTRUCTIONS[Const.AALOAD] = AALOAD; - INSTRUCTIONS[Const.BALOAD] = BALOAD; - INSTRUCTIONS[Const.CALOAD] = CALOAD; - INSTRUCTIONS[Const.SALOAD] = SALOAD; - INSTRUCTIONS[Const.IASTORE] = IASTORE; - INSTRUCTIONS[Const.LASTORE] = LASTORE; - INSTRUCTIONS[Const.FASTORE] = FASTORE; - INSTRUCTIONS[Const.DASTORE] = DASTORE; - INSTRUCTIONS[Const.AASTORE] = AASTORE; - INSTRUCTIONS[Const.BASTORE] = BASTORE; - INSTRUCTIONS[Const.CASTORE] = CASTORE; - INSTRUCTIONS[Const.SASTORE] = SASTORE; - INSTRUCTIONS[Const.POP] = POP; - INSTRUCTIONS[Const.POP2] = POP2; - INSTRUCTIONS[Const.DUP] = DUP; - INSTRUCTIONS[Const.DUP_X1] = DUP_X1; - INSTRUCTIONS[Const.DUP_X2] = DUP_X2; - INSTRUCTIONS[Const.DUP2] = DUP2; - INSTRUCTIONS[Const.DUP2_X1] = DUP2_X1; - INSTRUCTIONS[Const.DUP2_X2] = DUP2_X2; - INSTRUCTIONS[Const.SWAP] = SWAP; - INSTRUCTIONS[Const.IADD] = IADD; - INSTRUCTIONS[Const.LADD] = LADD; - INSTRUCTIONS[Const.FADD] = FADD; - INSTRUCTIONS[Const.DADD] = DADD; - INSTRUCTIONS[Const.ISUB] = ISUB; - INSTRUCTIONS[Const.LSUB] = LSUB; - INSTRUCTIONS[Const.FSUB] = FSUB; - INSTRUCTIONS[Const.DSUB] = DSUB; - INSTRUCTIONS[Const.IMUL] = IMUL; - INSTRUCTIONS[Const.LMUL] = LMUL; - INSTRUCTIONS[Const.FMUL] = FMUL; - INSTRUCTIONS[Const.DMUL] = DMUL; - INSTRUCTIONS[Const.IDIV] = IDIV; - INSTRUCTIONS[Const.LDIV] = LDIV; - INSTRUCTIONS[Const.FDIV] = FDIV; - INSTRUCTIONS[Const.DDIV] = DDIV; - INSTRUCTIONS[Const.IREM] = IREM; - INSTRUCTIONS[Const.LREM] = LREM; - INSTRUCTIONS[Const.FREM] = FREM; - INSTRUCTIONS[Const.DREM] = DREM; - INSTRUCTIONS[Const.INEG] = INEG; - INSTRUCTIONS[Const.LNEG] = LNEG; - INSTRUCTIONS[Const.FNEG] = FNEG; - INSTRUCTIONS[Const.DNEG] = DNEG; - INSTRUCTIONS[Const.ISHL] = ISHL; - INSTRUCTIONS[Const.LSHL] = LSHL; - INSTRUCTIONS[Const.ISHR] = ISHR; - INSTRUCTIONS[Const.LSHR] = LSHR; - INSTRUCTIONS[Const.IUSHR] = IUSHR; - INSTRUCTIONS[Const.LUSHR] = LUSHR; - INSTRUCTIONS[Const.IAND] = IAND; - INSTRUCTIONS[Const.LAND] = LAND; - INSTRUCTIONS[Const.IOR] = IOR; - INSTRUCTIONS[Const.LOR] = LOR; - INSTRUCTIONS[Const.IXOR] = IXOR; - INSTRUCTIONS[Const.LXOR] = LXOR; - INSTRUCTIONS[Const.I2L] = I2L; - INSTRUCTIONS[Const.I2F] = I2F; - INSTRUCTIONS[Const.I2D] = I2D; - INSTRUCTIONS[Const.L2I] = L2I; - INSTRUCTIONS[Const.L2F] = L2F; - INSTRUCTIONS[Const.L2D] = L2D; - INSTRUCTIONS[Const.F2I] = F2I; - INSTRUCTIONS[Const.F2L] = F2L; - INSTRUCTIONS[Const.F2D] = F2D; - INSTRUCTIONS[Const.D2I] = D2I; - INSTRUCTIONS[Const.D2L] = D2L; - INSTRUCTIONS[Const.D2F] = D2F; - INSTRUCTIONS[Const.I2B] = I2B; - INSTRUCTIONS[Const.I2C] = I2C; - INSTRUCTIONS[Const.I2S] = I2S; - INSTRUCTIONS[Const.LCMP] = LCMP; - INSTRUCTIONS[Const.FCMPL] = FCMPL; - INSTRUCTIONS[Const.FCMPG] = FCMPG; - INSTRUCTIONS[Const.DCMPL] = DCMPL; - INSTRUCTIONS[Const.DCMPG] = DCMPG; - INSTRUCTIONS[Const.IRETURN] = IRETURN; - INSTRUCTIONS[Const.LRETURN] = LRETURN; - INSTRUCTIONS[Const.FRETURN] = FRETURN; - INSTRUCTIONS[Const.DRETURN] = DRETURN; - INSTRUCTIONS[Const.ARETURN] = ARETURN; - INSTRUCTIONS[Const.RETURN] = RETURN; - INSTRUCTIONS[Const.ARRAYLENGTH] = ARRAYLENGTH; - INSTRUCTIONS[Const.ATHROW] = ATHROW; - INSTRUCTIONS[Const.MONITORENTER] = MONITORENTER; - INSTRUCTIONS[Const.MONITOREXIT] = MONITOREXIT; - } - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/InstructionFactory.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/InstructionFactory.java deleted file mode 100644 index 74d731b3..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/InstructionFactory.java +++ /dev/null @@ -1,800 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import org.apache.bcel.Const; - -/** - * Instances of this class may be used, e.g., to generate typed - * versions of instructions. Its main purpose is to be used as the - * byte code generating backend of a compiler. You can subclass it to - * add your own create methods. - *

- * Note: The static createXXX methods return singleton instances - * from the {@link InstructionConst} class. - * - * @see Const - * @see InstructionConst - */ -public class InstructionFactory implements InstructionConstants { - - // N.N. These must agree with the order of Constants.T_CHAR through T_LONG - private static final String[] short_names = { - "C", "F", "D", "B", "S", "I", "L" - }; - - /** - * @deprecated (since 6.0) will be made private; do not access directly, use getter/setter - */ - @Deprecated - protected ClassGen cg; - - /** - * @deprecated (since 6.0) will be made private; do not access directly, use getter/setter - */ - @Deprecated - protected ConstantPoolGen cp; - - - public InstructionFactory(final ClassGen cg, final ConstantPoolGen cp) { - this.cg = cg; - this.cp = cp; - } - - - /** Initialize with ClassGen object - */ - public InstructionFactory(final ClassGen cg) { - this(cg, cg.getConstantPool()); - } - - - /** Initialize just with ConstantPoolGen object - */ - public InstructionFactory(final ConstantPoolGen cp) { - this(null, cp); - } - - - /** Create an invoke instruction. (Except for invokedynamic.) - * - * @param class_name name of the called class - * @param name name of the called method - * @param ret_type return type of method - * @param arg_types argument types of method - * @param kind how to invoke, i.e., INVOKEINTERFACE, INVOKESTATIC, INVOKEVIRTUAL, - * or INVOKESPECIAL - * @see Const - */ - public InvokeInstruction createInvoke( final String class_name, final String name, final Type ret_type, - final Type[] arg_types, final short kind ) { - return createInvoke(class_name, name, ret_type, arg_types, kind, kind == Const.INVOKEINTERFACE); - } - - /** Create an invoke instruction. (Except for invokedynamic.) - * - * @param class_name name of the called class - * @param name name of the called method - * @param ret_type return type of method - * @param arg_types argument types of method - * @param kind how to invoke: INVOKEINTERFACE, INVOKESTATIC, INVOKEVIRTUAL, or INVOKESPECIAL - * @param use_interface force use of InterfaceMethodref - * @return A new InvokeInstruction. - * @since 6.5.0 - */ - public InvokeInstruction createInvoke( final String class_name, final String name, final Type ret_type, - final Type[] arg_types, final short kind, final boolean use_interface) { - if (kind != Const.INVOKESPECIAL && kind != Const.INVOKEVIRTUAL && kind != Const.INVOKESTATIC - && kind != Const.INVOKEINTERFACE && kind != Const.INVOKEDYNAMIC) { - throw new IllegalArgumentException("Unknown invoke kind: " + kind); - } - int index; - int nargs = 0; - final String signature = Type.getMethodSignature(ret_type, arg_types); - for (final Type arg_type : arg_types) { - nargs += arg_type.getSize(); - } - if (use_interface) { - index = cp.addInterfaceMethodref(class_name, name, signature); - } else { - index = cp.addMethodref(class_name, name, signature); - } - switch (kind) { - case Const.INVOKESPECIAL: - return new INVOKESPECIAL(index); - case Const.INVOKEVIRTUAL: - return new INVOKEVIRTUAL(index); - case Const.INVOKESTATIC: - return new INVOKESTATIC(index); - case Const.INVOKEINTERFACE: - return new INVOKEINTERFACE(index, nargs + 1); - case Const.INVOKEDYNAMIC: - return new INVOKEDYNAMIC(index); - default: - // Can't happen - throw new IllegalStateException("Unknown invoke kind: " + kind); - } - } - - /** Create an invokedynamic instruction. - * - * @param bootstrap_index index into the bootstrap_methods array - * @param name name of the called method - * @param ret_type return type of method - * @param arg_types argument types of method - * @see Constants - */ -/* - * createInvokeDynamic only needed if instrumention code wants to generate - * a new invokedynamic instruction. I don't think we need. (markro) - * - public InvokeInstruction createInvokeDynamic( int bootstrap_index, String name, Type ret_type, - Type[] arg_types) { - int index; - int nargs = 0; - String signature = Type.getMethodSignature(ret_type, arg_types); - for (int i = 0; i < arg_types.length; i++) { - nargs += arg_types[i].getSize(); - } - // UNDONE - needs to be added to ConstantPoolGen - //index = cp.addInvokeDynamic(bootstrap_index, name, signature); - index = 0; - return new INVOKEDYNAMIC(index); - } - */ - - /** Create a call to the most popular System.out.println() method. - * - * @param s the string to print - */ - public InstructionList createPrintln( final String s ) { - final InstructionList il = new InstructionList(); - final int out = cp.addFieldref("java.lang.System", "out", "Ljava/io/PrintStream;"); - final int println = cp.addMethodref("java.io.PrintStream", "println", "(Ljava/lang/String;)V"); - il.append(new GETSTATIC(out)); - il.append(new PUSH(cp, s)); - il.append(new INVOKEVIRTUAL(println)); - return il; - } - - - /** Uses PUSH to push a constant value onto the stack. - * @param value must be of type Number, Boolean, Character or String - */ - public Instruction createConstant( final Object value ) { - PUSH push; - if (value instanceof Number) { - push = new PUSH(cp, (Number) value); - } else if (value instanceof String) { - push = new PUSH(cp, (String) value); - } else if (value instanceof Boolean) { - push = new PUSH(cp, (Boolean) value); - } else if (value instanceof Character) { - push = new PUSH(cp, (Character) value); - } else { - throw new ClassGenException("Illegal type: " + value.getClass()); - } - return push.getInstruction(); - } - - private static class MethodObject { - - final Type[] arg_types; - final Type result_type; - final String class_name; - final String name; - - - MethodObject(final String c, final String n, final Type r, final Type[] a) { - class_name = c; - name = n; - result_type = r; - arg_types = a; - } - } - - - private InvokeInstruction createInvoke( final MethodObject m, final short kind ) { - return createInvoke(m.class_name, m.name, m.result_type, m.arg_types, kind); - } - - private static final MethodObject[] append_mos = { - new MethodObject("java.lang.StringBuffer", "append", Type.STRINGBUFFER, new Type[] { - Type.STRING - }), - new MethodObject("java.lang.StringBuffer", "append", Type.STRINGBUFFER, new Type[] { - Type.OBJECT - }), - null, - null, // indices 2, 3 - new MethodObject("java.lang.StringBuffer", "append", Type.STRINGBUFFER, new Type[] { - Type.BOOLEAN - }), - new MethodObject("java.lang.StringBuffer", "append", Type.STRINGBUFFER, new Type[] { - Type.CHAR - }), - new MethodObject("java.lang.StringBuffer", "append", Type.STRINGBUFFER, new Type[] { - Type.FLOAT - }), - new MethodObject("java.lang.StringBuffer", "append", Type.STRINGBUFFER, new Type[] { - Type.DOUBLE - }), - new MethodObject("java.lang.StringBuffer", "append", Type.STRINGBUFFER, new Type[] { - Type.INT - }), - new MethodObject("java.lang.StringBuffer", "append", Type.STRINGBUFFER, // No append(byte) - new Type[] { - Type.INT - }), - new MethodObject("java.lang.StringBuffer", "append", Type.STRINGBUFFER, // No append(short) - new Type[] { - Type.INT - }), - new MethodObject("java.lang.StringBuffer", "append", Type.STRINGBUFFER, new Type[] { - Type.LONG - }) - }; - - - private static boolean isString( final Type type ) { - return (type instanceof ObjectType) && - ((ObjectType) type).getClassName().equals("java.lang.String"); - } - - - public Instruction createAppend( final Type type ) { - final byte t = type.getType(); - if (isString(type)) { - return createInvoke(append_mos[0], Const.INVOKEVIRTUAL); - } - switch (t) { - case Const.T_BOOLEAN: - case Const.T_CHAR: - case Const.T_FLOAT: - case Const.T_DOUBLE: - case Const.T_BYTE: - case Const.T_SHORT: - case Const.T_INT: - case Const.T_LONG: - return createInvoke(append_mos[t], Const.INVOKEVIRTUAL); - case Const.T_ARRAY: - case Const.T_OBJECT: - return createInvoke(append_mos[1], Const.INVOKEVIRTUAL); - default: - throw new IllegalArgumentException("No append for this type? " + type); - } - } - - - /** Create a field instruction. - * - * @param class_name name of the accessed class - * @param name name of the referenced field - * @param type type of field - * @param kind how to access, i.e., GETFIELD, PUTFIELD, GETSTATIC, PUTSTATIC - * @see Const - */ - public FieldInstruction createFieldAccess( final String class_name, final String name, final Type type, final short kind ) { - int index; - final String signature = type.getSignature(); - index = cp.addFieldref(class_name, name, signature); - switch (kind) { - case Const.GETFIELD: - return new GETFIELD(index); - case Const.PUTFIELD: - return new PUTFIELD(index); - case Const.GETSTATIC: - return new GETSTATIC(index); - case Const.PUTSTATIC: - return new PUTSTATIC(index); - default: - throw new IllegalArgumentException("Unknown getfield kind:" + kind); - } - } - - - /** Create reference to `this' - */ - public static Instruction createThis() { - return new ALOAD(0); - } - - - /** Create typed return - */ - public static ReturnInstruction createReturn( final Type type ) { - switch (type.getType()) { - case Const.T_ARRAY: - case Const.T_OBJECT: - return InstructionConst.ARETURN; - case Const.T_INT: - case Const.T_SHORT: - case Const.T_BOOLEAN: - case Const.T_CHAR: - case Const.T_BYTE: - return InstructionConst.IRETURN; - case Const.T_FLOAT: - return InstructionConst.FRETURN; - case Const.T_DOUBLE: - return InstructionConst.DRETURN; - case Const.T_LONG: - return InstructionConst.LRETURN; - case Const.T_VOID: - return InstructionConst.RETURN; - default: - throw new IllegalArgumentException("Invalid type: " + type); - } - } - - - private static ArithmeticInstruction createBinaryIntOp( final char first, final String op ) { - switch (first) { - case '-': - return InstructionConst.ISUB; - case '+': - return InstructionConst.IADD; - case '%': - return InstructionConst.IREM; - case '*': - return InstructionConst.IMUL; - case '/': - return InstructionConst.IDIV; - case '&': - return InstructionConst.IAND; - case '|': - return InstructionConst.IOR; - case '^': - return InstructionConst.IXOR; - case '<': - return InstructionConst.ISHL; - case '>': - return op.equals(">>>") ? InstructionConst.IUSHR : InstructionConst.ISHR; - default: - throw new IllegalArgumentException("Invalid operand " + op); - } - } - - - private static ArithmeticInstruction createBinaryLongOp( final char first, final String op ) { - switch (first) { - case '-': - return InstructionConst.LSUB; - case '+': - return InstructionConst.LADD; - case '%': - return InstructionConst.LREM; - case '*': - return InstructionConst.LMUL; - case '/': - return InstructionConst.LDIV; - case '&': - return InstructionConst.LAND; - case '|': - return InstructionConst.LOR; - case '^': - return InstructionConst.LXOR; - case '<': - return InstructionConst.LSHL; - case '>': - return op.equals(">>>") ? InstructionConst.LUSHR : InstructionConst.LSHR; - default: - throw new IllegalArgumentException("Invalid operand " + op); - } - } - - - private static ArithmeticInstruction createBinaryFloatOp( final char op ) { - switch (op) { - case '-': - return InstructionConst.FSUB; - case '+': - return InstructionConst.FADD; - case '*': - return InstructionConst.FMUL; - case '/': - return InstructionConst.FDIV; - case '%': - return InstructionConst.FREM; - default: - throw new IllegalArgumentException("Invalid operand " + op); - } - } - - - private static ArithmeticInstruction createBinaryDoubleOp( final char op ) { - switch (op) { - case '-': - return InstructionConst.DSUB; - case '+': - return InstructionConst.DADD; - case '*': - return InstructionConst.DMUL; - case '/': - return InstructionConst.DDIV; - case '%': - return InstructionConst.DREM; - default: - throw new IllegalArgumentException("Invalid operand " + op); - } - } - - - /** - * Create binary operation for simple basic types, such as int and float. - * - * @param op operation, such as "+", "*", "<<", etc. - */ - public static ArithmeticInstruction createBinaryOperation( final String op, final Type type ) { - final char first = op.charAt(0); - switch (type.getType()) { - case Const.T_BYTE: - case Const.T_SHORT: - case Const.T_INT: - case Const.T_CHAR: - return createBinaryIntOp(first, op); - case Const.T_LONG: - return createBinaryLongOp(first, op); - case Const.T_FLOAT: - return createBinaryFloatOp(first); - case Const.T_DOUBLE: - return createBinaryDoubleOp(first); - default: - throw new IllegalArgumentException("Invalid type " + type); - } - } - - - /** - * @param size size of operand, either 1 (int, e.g.) or 2 (double) - */ - public static StackInstruction createPop( final int size ) { - return (size == 2) ? InstructionConst.POP2 : InstructionConst.POP; - } - - - /** - * @param size size of operand, either 1 (int, e.g.) or 2 (double) - */ - public static StackInstruction createDup( final int size ) { - return (size == 2) ? InstructionConst.DUP2 : InstructionConst.DUP; - } - - - /** - * @param size size of operand, either 1 (int, e.g.) or 2 (double) - */ - public static StackInstruction createDup_2( final int size ) { - return (size == 2) ? InstructionConst.DUP2_X2 : InstructionConst.DUP_X2; - } - - - /** - * @param size size of operand, either 1 (int, e.g.) or 2 (double) - */ - public static StackInstruction createDup_1( final int size ) { - return (size == 2) ? InstructionConst.DUP2_X1 : InstructionConst.DUP_X1; - } - - - /** - * @param index index of local variable - */ - public static LocalVariableInstruction createStore( final Type type, final int index ) { - switch (type.getType()) { - case Const.T_BOOLEAN: - case Const.T_CHAR: - case Const.T_BYTE: - case Const.T_SHORT: - case Const.T_INT: - return new ISTORE(index); - case Const.T_FLOAT: - return new FSTORE(index); - case Const.T_DOUBLE: - return new DSTORE(index); - case Const.T_LONG: - return new LSTORE(index); - case Const.T_ARRAY: - case Const.T_OBJECT: - return new ASTORE(index); - default: - throw new IllegalArgumentException("Invalid type " + type); - } - } - - - /** - * @param index index of local variable - */ - public static LocalVariableInstruction createLoad( final Type type, final int index ) { - switch (type.getType()) { - case Const.T_BOOLEAN: - case Const.T_CHAR: - case Const.T_BYTE: - case Const.T_SHORT: - case Const.T_INT: - return new ILOAD(index); - case Const.T_FLOAT: - return new FLOAD(index); - case Const.T_DOUBLE: - return new DLOAD(index); - case Const.T_LONG: - return new LLOAD(index); - case Const.T_ARRAY: - case Const.T_OBJECT: - return new ALOAD(index); - default: - throw new IllegalArgumentException("Invalid type " + type); - } - } - - - /** - * @param type type of elements of array, i.e., array.getElementType() - */ - public static ArrayInstruction createArrayLoad( final Type type ) { - switch (type.getType()) { - case Const.T_BOOLEAN: - case Const.T_BYTE: - return InstructionConst.BALOAD; - case Const.T_CHAR: - return InstructionConst.CALOAD; - case Const.T_SHORT: - return InstructionConst.SALOAD; - case Const.T_INT: - return InstructionConst.IALOAD; - case Const.T_FLOAT: - return InstructionConst.FALOAD; - case Const.T_DOUBLE: - return InstructionConst.DALOAD; - case Const.T_LONG: - return InstructionConst.LALOAD; - case Const.T_ARRAY: - case Const.T_OBJECT: - return InstructionConst.AALOAD; - default: - throw new IllegalArgumentException("Invalid type " + type); - } - } - - - /** - * @param type type of elements of array, i.e., array.getElementType() - */ - public static ArrayInstruction createArrayStore( final Type type ) { - switch (type.getType()) { - case Const.T_BOOLEAN: - case Const.T_BYTE: - return InstructionConst.BASTORE; - case Const.T_CHAR: - return InstructionConst.CASTORE; - case Const.T_SHORT: - return InstructionConst.SASTORE; - case Const.T_INT: - return InstructionConst.IASTORE; - case Const.T_FLOAT: - return InstructionConst.FASTORE; - case Const.T_DOUBLE: - return InstructionConst.DASTORE; - case Const.T_LONG: - return InstructionConst.LASTORE; - case Const.T_ARRAY: - case Const.T_OBJECT: - return InstructionConst.AASTORE; - default: - throw new IllegalArgumentException("Invalid type " + type); - } - } - - - /** Create conversion operation for two stack operands, this may be an I2C, instruction, e.g., - * if the operands are basic types and CHECKCAST if they are reference types. - */ - public Instruction createCast( final Type src_type, final Type dest_type ) { - if ((src_type instanceof BasicType) && (dest_type instanceof BasicType)) { - final byte dest = dest_type.getType(); - byte src = src_type.getType(); - if (dest == Const.T_LONG - && (src == Const.T_CHAR || src == Const.T_BYTE || src == Const.T_SHORT)) { - src = Const.T_INT; - } - final String name = "org.apache.bcel.generic." + short_names[src - Const.T_CHAR] + "2" - + short_names[dest - Const.T_CHAR]; - Instruction i = null; - try { - i = (Instruction) java.lang.Class.forName(name).newInstance(); - } catch (final Exception e) { - throw new IllegalArgumentException("Could not find instruction: " + name, e); - } - return i; - } else if ((src_type instanceof ReferenceType) && (dest_type instanceof ReferenceType)) { - if (dest_type instanceof ArrayType) { - return new CHECKCAST(cp.addArrayClass((ArrayType) dest_type)); - } - return new CHECKCAST(cp.addClass(((ObjectType) dest_type).getClassName())); - } else { - throw new IllegalArgumentException("Cannot cast " + src_type + " to " + dest_type); - } - } - - - public GETFIELD createGetField( final String class_name, final String name, final Type t ) { - return new GETFIELD(cp.addFieldref(class_name, name, t.getSignature())); - } - - - public GETSTATIC createGetStatic( final String class_name, final String name, final Type t ) { - return new GETSTATIC(cp.addFieldref(class_name, name, t.getSignature())); - } - - - public PUTFIELD createPutField( final String class_name, final String name, final Type t ) { - return new PUTFIELD(cp.addFieldref(class_name, name, t.getSignature())); - } - - - public PUTSTATIC createPutStatic( final String class_name, final String name, final Type t ) { - return new PUTSTATIC(cp.addFieldref(class_name, name, t.getSignature())); - } - - - public CHECKCAST createCheckCast( final ReferenceType t ) { - if (t instanceof ArrayType) { - return new CHECKCAST(cp.addArrayClass((ArrayType) t)); - } - return new CHECKCAST(cp.addClass((ObjectType) t)); - } - - - public INSTANCEOF createInstanceOf( final ReferenceType t ) { - if (t instanceof ArrayType) { - return new INSTANCEOF(cp.addArrayClass((ArrayType) t)); - } - return new INSTANCEOF(cp.addClass((ObjectType) t)); - } - - - public NEW createNew( final ObjectType t ) { - return new NEW(cp.addClass(t)); - } - - - public NEW createNew( final String s ) { - return createNew(ObjectType.getInstance(s)); - } - - - /** Create new array of given size and type. - * @return an instruction that creates the corresponding array at runtime, i.e. is an AllocationInstruction - */ - public Instruction createNewArray( final Type t, final short dim ) { - if (dim == 1) { - if (t instanceof ObjectType) { - return new ANEWARRAY(cp.addClass((ObjectType) t)); - } else if (t instanceof ArrayType) { - return new ANEWARRAY(cp.addArrayClass((ArrayType) t)); - } else { - return new NEWARRAY(t.getType()); - } - } - ArrayType at; - if (t instanceof ArrayType) { - at = (ArrayType) t; - } else { - at = new ArrayType(t, dim); - } - return new MULTIANEWARRAY(cp.addArrayClass(at), dim); - } - - - /** Create "null" value for reference types, 0 for basic types like int - */ - public static Instruction createNull( final Type type ) { - switch (type.getType()) { - case Const.T_ARRAY: - case Const.T_OBJECT: - return InstructionConst.ACONST_NULL; - case Const.T_INT: - case Const.T_SHORT: - case Const.T_BOOLEAN: - case Const.T_CHAR: - case Const.T_BYTE: - return InstructionConst.ICONST_0; - case Const.T_FLOAT: - return InstructionConst.FCONST_0; - case Const.T_DOUBLE: - return InstructionConst.DCONST_0; - case Const.T_LONG: - return InstructionConst.LCONST_0; - case Const.T_VOID: - return InstructionConst.NOP; - default: - throw new IllegalArgumentException("Invalid type: " + type); - } - } - - - /** Create branch instruction by given opcode, except LOOKUPSWITCH and TABLESWITCH. - * For those you should use the SWITCH compound instruction. - */ - public static BranchInstruction createBranchInstruction( final short opcode, final InstructionHandle target ) { - switch (opcode) { - case Const.IFEQ: - return new IFEQ(target); - case Const.IFNE: - return new IFNE(target); - case Const.IFLT: - return new IFLT(target); - case Const.IFGE: - return new IFGE(target); - case Const.IFGT: - return new IFGT(target); - case Const.IFLE: - return new IFLE(target); - case Const.IF_ICMPEQ: - return new IF_ICMPEQ(target); - case Const.IF_ICMPNE: - return new IF_ICMPNE(target); - case Const.IF_ICMPLT: - return new IF_ICMPLT(target); - case Const.IF_ICMPGE: - return new IF_ICMPGE(target); - case Const.IF_ICMPGT: - return new IF_ICMPGT(target); - case Const.IF_ICMPLE: - return new IF_ICMPLE(target); - case Const.IF_ACMPEQ: - return new IF_ACMPEQ(target); - case Const.IF_ACMPNE: - return new IF_ACMPNE(target); - case Const.GOTO: - return new GOTO(target); - case Const.JSR: - return new JSR(target); - case Const.IFNULL: - return new IFNULL(target); - case Const.IFNONNULL: - return new IFNONNULL(target); - case Const.GOTO_W: - return new GOTO_W(target); - case Const.JSR_W: - return new JSR_W(target); - default: - throw new IllegalArgumentException("Invalid opcode: " + opcode); - } - } - - - public void setClassGen( final ClassGen c ) { - cg = c; - } - - - public ClassGen getClassGen() { - return cg; - } - - - public void setConstantPool( final ConstantPoolGen c ) { - cp = c; - } - - - public ConstantPoolGen getConstantPool() { - return cp; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/InstructionHandle.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/InstructionHandle.java deleted file mode 100644 index 502427ef..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/InstructionHandle.java +++ /dev/null @@ -1,315 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -import org.apache.bcel.classfile.Utility; - -/** - * Instances of this class give users a handle to the instructions contained in - * an InstructionList. Instruction objects may be used more than once within a - * list, this is useful because it saves memory and may be much faster. - * - * Within an InstructionList an InstructionHandle object is wrapped - * around all instructions, i.e., it implements a cell in a - * doubly-linked list. From the outside only the next and the - * previous instruction (handle) are accessible. One - * can traverse the list via an Enumeration returned by - * InstructionList.elements(). - * - * @see Instruction - * @see BranchHandle - * @see InstructionList - */ -public class InstructionHandle { - - private InstructionHandle next; - private InstructionHandle prev; - private Instruction instruction; - - /** - * @deprecated (since 6.0) will be made private; do not access directly, use getter/setter - */ - @Deprecated - protected int i_position = -1; // byte code offset of instruction - - private Set targeters; - private Map attributes; - - - /** - * Does nothing. - * - * @deprecated Does nothing as of 6.3.1. - */ - @Deprecated - protected void addHandle() { - // noop - } - - public final InstructionHandle getNext() { - return next; - } - - - public final InstructionHandle getPrev() { - return prev; - } - - - public final Instruction getInstruction() { - return instruction; - } - - - /** - * Replace current instruction contained in this handle. - * Old instruction is disposed using Instruction.dispose(). - */ - public void setInstruction( final Instruction i ) { // Overridden in BranchHandle TODO could be package-protected? - if (i == null) { - throw new ClassGenException("Assigning null to handle"); - } - if ((this.getClass() != BranchHandle.class) && (i instanceof BranchInstruction)) { - throw new ClassGenException("Assigning branch instruction " + i + " to plain handle"); - } - if (instruction != null) { - instruction.dispose(); - } - instruction = i; - } - - - /** - * Temporarily swap the current instruction, without disturbing - * anything. Meant to be used by a debugger, implementing - * breakpoints. Current instruction is returned. - *

- * Warning: if this is used on a BranchHandle then some methods such as - * getPosition() will still refer to the original cached instruction, whereas - * other BH methods may affect the cache and the replacement instruction. - */ - // See BCEL-273 - // TODO remove this method in any redesign of BCEL - public Instruction swapInstruction( final Instruction i ) { - final Instruction oldInstruction = instruction; - instruction = i; - return oldInstruction; - } - - - /*private*/protected InstructionHandle(final Instruction i) { - setInstruction(i); - } - - /** Factory method. - */ - static InstructionHandle getInstructionHandle( final Instruction i ) { - return new InstructionHandle(i); - } - - - /** - * Called by InstructionList.setPositions when setting the position for every - * instruction. In the presence of variable length instructions `setPositions()' - * performs multiple passes over the instruction list to calculate the - * correct (byte) positions and offsets by calling this function. - * - * @param offset additional offset caused by preceding (variable length) instructions - * @param max_offset the maximum offset that may be caused by these instructions - * @return additional offset caused by possible change of this instruction's length - */ - protected int updatePosition( final int offset, final int max_offset ) { - i_position += offset; - return 0; - } - - - /** @return the position, i.e., the byte code offset of the contained - * instruction. This is accurate only after - * InstructionList.setPositions() has been called. - */ - public int getPosition() { - return i_position; - } - - - /** Set the position, i.e., the byte code offset of the contained - * instruction. - */ - void setPosition( final int pos ) { - i_position = pos; - } - - - /** - * Delete contents, i.e., remove user access. - */ - void dispose() { - next = prev = null; - instruction.dispose(); - instruction = null; - i_position = -1; - attributes = null; - removeAllTargeters(); - } - - - /** Remove all targeters, if any. - */ - public void removeAllTargeters() { - if (targeters != null) { - targeters.clear(); - } - } - - - /** - * Denote this handle isn't referenced anymore by t. - */ - public void removeTargeter( final InstructionTargeter t ) { - if (targeters != null) { - targeters.remove(t); - } - } - - - /** - * Denote this handle is being referenced by t. - */ - public void addTargeter( final InstructionTargeter t ) { - if (targeters == null) { - targeters = new HashSet<>(); - } - //if(!targeters.contains(t)) - targeters.add(t); - } - - - public boolean hasTargeters() { - return (targeters != null) && (targeters.size() > 0); - } - - - /** - * @return null, if there are no targeters - */ - public InstructionTargeter[] getTargeters() { - if (!hasTargeters()) { - return new InstructionTargeter[0]; - } - final InstructionTargeter[] t = new InstructionTargeter[targeters.size()]; - targeters.toArray(t); - return t; - } - - - /** @return a (verbose) string representation of the contained instruction. - */ - public String toString( final boolean verbose ) { - return Utility.format(i_position, 4, false, ' ') + ": " + instruction.toString(verbose); - } - - - /** @return a string representation of the contained instruction. - */ - @Override - public String toString() { - return toString(true); - } - - - /** Add an attribute to an instruction handle. - * - * @param key the key object to store/retrieve the attribute - * @param attr the attribute to associate with this handle - */ - public void addAttribute( final Object key, final Object attr ) { - if (attributes == null) { - attributes = new HashMap<>(3); - } - attributes.put(key, attr); - } - - - /** Delete an attribute of an instruction handle. - * - * @param key the key object to retrieve the attribute - */ - public void removeAttribute( final Object key ) { - if (attributes != null) { - attributes.remove(key); - } - } - - - /** Get attribute of an instruction handle. - * - * @param key the key object to store/retrieve the attribute - */ - public Object getAttribute( final Object key ) { - if (attributes != null) { - return attributes.get(key); - } - return null; - } - - - /** @return all attributes associated with this handle - */ - public Collection getAttributes() { - if (attributes == null) { - attributes = new HashMap<>(3); - } - return attributes.values(); - } - - - /** Convenience method, simply calls accept() on the contained instruction. - * - * @param v Visitor object - */ - public void accept( final Visitor v ) { - instruction.accept(v); - } - - - /** - * @param next the next to set - * @since 6.0 - */ - final InstructionHandle setNext(final InstructionHandle next) { - this.next = next; - return next; - } - - - /** - * @param prev the prev to set - * @since 6.0 - */ - final InstructionHandle setPrev(final InstructionHandle prev) { - this.prev = prev; - return prev; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/InstructionList.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/InstructionList.java deleted file mode 100644 index 9e591bfb..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/InstructionList.java +++ /dev/null @@ -1,1258 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import java.io.ByteArrayOutputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.NoSuchElementException; - -import org.apache.bcel.Const; -import org.apache.bcel.classfile.Constant; -import org.apache.bcel.util.ByteSequence; - -/** - * This class is a container for a list of Instruction objects. Instructions can be appended, inserted, moved, deleted, etc.. - * Instructions are being wrapped into InstructionHandles objects that are returned upon append/insert operations. They - * give the user (read only) access to the list structure, such that it can be traversed and manipulated in a controlled way. - * - * A list is finally dumped to a byte code array with getByteCode. - * - * @see Instruction - * @see InstructionHandle - * @see BranchHandle - */ -public class InstructionList implements Iterable { - - private InstructionHandle start = null; - private InstructionHandle end = null; - private int length = 0; // number of elements in list - private int[] bytePositions; // byte code offsets corresponding to instructions - - /** - * Create (empty) instruction list. - */ - public InstructionList() { - } - - /** - * Create instruction list containing one instruction. - * - * @param i - * initial instruction - */ - public InstructionList(final Instruction i) { - append(i); - } - - /** - * Create instruction list containing one instruction. - * - * @param i - * initial instruction - */ - public InstructionList(final BranchInstruction i) { - append(i); - } - - /** - * Initialize list with (nonnull) compound instruction. Consumes argument list, i.e., it becomes empty. - * - * @param c - * compound instruction (list) - */ - public InstructionList(final CompoundInstruction c) { - append(c.getInstructionList()); - } - - /** - * Test for empty list. - */ - public boolean isEmpty() { - return start == null; - } // && end == null - - /** - * Find the target instruction (handle) that corresponds to the given target position (byte code offset). - * - * @param ihs - * array of instruction handles, i.e. il.getInstructionHandles() - * @param pos - * array of positions corresponding to ihs, i.e. il.getInstructionPositions() - * @param count - * length of arrays - * @param target - * target position to search for - * @return target position's instruction handle if available - */ - public static InstructionHandle findHandle(final InstructionHandle[] ihs, final int[] pos, final int count, final int target) { - int l = 0; - int r = count - 1; - /* - * Do a binary search since the pos array is orderd. - */ - do { - final int i = (l + r) >>> 1; - final int j = pos[i]; - if (j == target) { - return ihs[i]; - } else if (target < j) { - r = i - 1; - } else { - l = i + 1; - } - } while (l <= r); - return null; - } - - /** - * Get instruction handle for instruction at byte code position pos. This only works properly, if the list is freshly initialized from a byte array or - * setPositions() has been called before this method. - * - * @param pos - * byte code position to search for - * @return target position's instruction handle if available - */ - public InstructionHandle findHandle(final int pos) { - final int[] positions = bytePositions; - InstructionHandle ih = start; - for (int i = 0; i < length; i++) { - if (positions[i] == pos) { - return ih; - } - ih = ih.getNext(); - } - return null; - } - - /** - * Initialize instruction list from byte array. - * - * @param code - * byte array containing the instructions - */ - public InstructionList(final byte[] code) { - int count = 0; // Contains actual length - int[] pos; - InstructionHandle[] ihs; - try (ByteSequence bytes = new ByteSequence(code)) { - ihs = new InstructionHandle[code.length]; - pos = new int[code.length]; // Can't be more than that - /* - * Pass 1: Create an object for each byte code and append them to the list. - */ - while (bytes.available() > 0) { - // Remember byte offset and associate it with the instruction - final int off = bytes.getIndex(); - pos[count] = off; - /* - * Read one instruction from the byte stream, the byte position is set accordingly. - */ - final Instruction i = Instruction.readInstruction(bytes); - InstructionHandle ih; - if (i instanceof BranchInstruction) { - ih = append((BranchInstruction) i); - } else { - ih = append(i); - } - ih.setPosition(off); - ihs[count] = ih; - count++; - } - } catch (final IOException e) { - throw new ClassGenException(e.toString(), e); - } - bytePositions = new int[count]; // Trim to proper size - System.arraycopy(pos, 0, bytePositions, 0, count); - /* - * Pass 2: Look for BranchInstruction and update their targets, i.e., convert offsets to instruction handles. - */ - for (int i = 0; i < count; i++) { - if (ihs[i] instanceof BranchHandle) { - final BranchInstruction bi = (BranchInstruction) ihs[i].getInstruction(); - int target = bi.getPosition() + bi.getIndex(); /* - * Byte code position: relative -> absolute. - */ - // Search for target position - InstructionHandle ih = findHandle(ihs, pos, count, target); - if (ih == null) { - throw new ClassGenException("Couldn't find target for branch: " + bi); - } - bi.setTarget(ih); // Update target - // If it is a Select instruction, update all branch targets - if (bi instanceof Select) { // Either LOOKUPSWITCH or TABLESWITCH - final Select s = (Select) bi; - final int[] indices = s.getIndices(); - for (int j = 0; j < indices.length; j++) { - target = bi.getPosition() + indices[j]; - ih = findHandle(ihs, pos, count, target); - if (ih == null) { - throw new ClassGenException("Couldn't find target for switch: " + bi); - } - s.setTarget(j, ih); // Update target - } - } - } - } - } - - /** - * Append another list after instruction (handle) ih contained in this list. Consumes argument list, i.e., it becomes empty. - * - * @param ih - * where to append the instruction list - * @param il - * Instruction list to append to this one - * @return instruction handle pointing to the first appended instruction - */ - public InstructionHandle append(final InstructionHandle ih, final InstructionList il) { - if (il == null) { - throw new ClassGenException("Appending null InstructionList"); - } - if (il.isEmpty()) { - return ih; - } - final InstructionHandle next = ih.getNext(); - final InstructionHandle ret = il.start; - ih.setNext(il.start); - il.start.setPrev(ih); - il.end.setNext(next); - if (next != null) { - next.setPrev(il.end); - } else { - end = il.end; // Update end ... - } - length += il.length; // Update length - il.clear(); - return ret; - } - - /** - * Append another list after instruction i contained in this list. Consumes argument list, i.e., it becomes empty. - * - * @param i - * where to append the instruction list - * @param il - * Instruction list to append to this one - * @return instruction handle pointing to the first appended instruction - */ - public InstructionHandle append(final Instruction i, final InstructionList il) { - InstructionHandle ih; - if ((ih = findInstruction2(i)) == null) { - throw new ClassGenException("Instruction " + i + " is not contained in this list."); - } - return append(ih, il); - } - - /** - * Append another list to this one. Consumes argument list, i.e., it becomes empty. - * - * @param il - * list to append to end of this list - * @return instruction handle of the first appended instruction - */ - public InstructionHandle append(final InstructionList il) { - if (il == null) { - throw new ClassGenException("Appending null InstructionList"); - } - if (il.isEmpty()) { - return null; - } - if (isEmpty()) { - start = il.start; - end = il.end; - length = il.length; - il.clear(); - return start; - } - return append(end, il); // was end.instruction - } - - /** - * Append an instruction to the end of this list. - * - * @param ih - * instruction to append - */ - private void append(final InstructionHandle ih) { - if (isEmpty()) { - start = end = ih; - ih.setNext(ih.setPrev(null)); - } else { - end.setNext(ih); - ih.setPrev(end); - ih.setNext(null); - end = ih; - } - length++; // Update length - } - - /** - * Append an instruction to the end of this list. - * - * @param i - * instruction to append - * @return instruction handle of the appended instruction - */ - public InstructionHandle append(final Instruction i) { - final InstructionHandle ih = InstructionHandle.getInstructionHandle(i); - append(ih); - return ih; - } - - /** - * Append a branch instruction to the end of this list. - * - * @param i - * branch instruction to append - * @return branch instruction handle of the appended instruction - */ - public BranchHandle append(final BranchInstruction i) { - final BranchHandle ih = BranchHandle.getBranchHandle(i); - append(ih); - return ih; - } - - /** - * Append a single instruction j after another instruction i, which must be in this list of course! - * - * @param i - * Instruction in list - * @param j - * Instruction to append after i in list - * @return instruction handle of the first appended instruction - */ - public InstructionHandle append(final Instruction i, final Instruction j) { - return append(i, new InstructionList(j)); - } - - /** - * Append a compound instruction, after instruction i. - * - * @param i - * Instruction in list - * @param c - * The composite instruction (containing an InstructionList) - * @return instruction handle of the first appended instruction - */ - public InstructionHandle append(final Instruction i, final CompoundInstruction c) { - return append(i, c.getInstructionList()); - } - - /** - * Append a compound instruction. - * - * @param c - * The composite instruction (containing an InstructionList) - * @return instruction handle of the first appended instruction - */ - public InstructionHandle append(final CompoundInstruction c) { - return append(c.getInstructionList()); - } - - /** - * Append a compound instruction. - * - * @param ih - * where to append the instruction list - * @param c - * The composite instruction (containing an InstructionList) - * @return instruction handle of the first appended instruction - */ - public InstructionHandle append(final InstructionHandle ih, final CompoundInstruction c) { - return append(ih, c.getInstructionList()); - } - - /** - * Append an instruction after instruction (handle) ih contained in this list. - * - * @param ih - * where to append the instruction list - * @param i - * Instruction to append - * @return instruction handle pointing to the first appended instruction - */ - public InstructionHandle append(final InstructionHandle ih, final Instruction i) { - return append(ih, new InstructionList(i)); - } - - /** - * Append an instruction after instruction (handle) ih contained in this list. - * - * @param ih - * where to append the instruction list - * @param i - * Instruction to append - * @return instruction handle pointing to the first appended instruction - */ - public BranchHandle append(final InstructionHandle ih, final BranchInstruction i) { - final BranchHandle bh = BranchHandle.getBranchHandle(i); - final InstructionList il = new InstructionList(); - il.append(bh); - append(ih, il); - return bh; - } - - /** - * Insert another list before Instruction handle ih contained in this list. Consumes argument list, i.e., it becomes empty. - * - * @param ih - * where to append the instruction list - * @param il - * Instruction list to insert - * @return instruction handle of the first inserted instruction - */ - public InstructionHandle insert(final InstructionHandle ih, final InstructionList il) { - if (il == null) { - throw new ClassGenException("Inserting null InstructionList"); - } - if (il.isEmpty()) { - return ih; - } - final InstructionHandle prev = ih.getPrev(); - final InstructionHandle ret = il.start; - ih.setPrev(il.end); - il.end.setNext(ih); - il.start.setPrev(prev); - if (prev != null) { - prev.setNext(il.start); - } else { - start = il.start; // Update start ... - } - length += il.length; // Update length - il.clear(); - return ret; - } - - /** - * Insert another list. - * - * @param il - * list to insert before start of this list - * @return instruction handle of the first inserted instruction - */ - public InstructionHandle insert(final InstructionList il) { - if (isEmpty()) { - append(il); // Code is identical for this case - return start; - } - return insert(start, il); - } - - /** - * Insert an instruction at start of this list. - * - * @param ih - * instruction to insert - */ - private void insert(final InstructionHandle ih) { - if (isEmpty()) { - start = end = ih; - ih.setNext(ih.setPrev(null)); - } else { - start.setPrev(ih); - ih.setNext(start); - ih.setPrev(null); - start = ih; - } - length++; - } - - /** - * Insert another list before Instruction i contained in this list. Consumes argument list, i.e., it becomes empty. - * - * @param i - * where to append the instruction list - * @param il - * Instruction list to insert - * @return instruction handle pointing to the first inserted instruction, i.e., il.getStart() - */ - public InstructionHandle insert(final Instruction i, final InstructionList il) { - InstructionHandle ih; - if ((ih = findInstruction1(i)) == null) { - throw new ClassGenException("Instruction " + i + " is not contained in this list."); - } - return insert(ih, il); - } - - /** - * Insert an instruction at start of this list. - * - * @param i - * instruction to insert - * @return instruction handle of the inserted instruction - */ - public InstructionHandle insert(final Instruction i) { - final InstructionHandle ih = InstructionHandle.getInstructionHandle(i); - insert(ih); - return ih; - } - - /** - * Insert a branch instruction at start of this list. - * - * @param i - * branch instruction to insert - * @return branch instruction handle of the appended instruction - */ - public BranchHandle insert(final BranchInstruction i) { - final BranchHandle ih = BranchHandle.getBranchHandle(i); - insert(ih); - return ih; - } - - /** - * Insert a single instruction j before another instruction i, which must be in this list of course! - * - * @param i - * Instruction in list - * @param j - * Instruction to insert before i in list - * @return instruction handle of the first inserted instruction - */ - public InstructionHandle insert(final Instruction i, final Instruction j) { - return insert(i, new InstructionList(j)); - } - - /** - * Insert a compound instruction before instruction i. - * - * @param i - * Instruction in list - * @param c - * The composite instruction (containing an InstructionList) - * @return instruction handle of the first inserted instruction - */ - public InstructionHandle insert(final Instruction i, final CompoundInstruction c) { - return insert(i, c.getInstructionList()); - } - - /** - * Insert a compound instruction. - * - * @param c - * The composite instruction (containing an InstructionList) - * @return instruction handle of the first inserted instruction - */ - public InstructionHandle insert(final CompoundInstruction c) { - return insert(c.getInstructionList()); - } - - /** - * Insert an instruction before instruction (handle) ih contained in this list. - * - * @param ih - * where to insert to the instruction list - * @param i - * Instruction to insert - * @return instruction handle of the first inserted instruction - */ - public InstructionHandle insert(final InstructionHandle ih, final Instruction i) { - return insert(ih, new InstructionList(i)); - } - - /** - * Insert a compound instruction. - * - * @param ih - * where to insert the instruction list - * @param c - * The composite instruction (containing an InstructionList) - * @return instruction handle of the first inserted instruction - */ - public InstructionHandle insert(final InstructionHandle ih, final CompoundInstruction c) { - return insert(ih, c.getInstructionList()); - } - - /** - * Insert an instruction before instruction (handle) ih contained in this list. - * - * @param ih - * where to insert to the instruction list - * @param i - * Instruction to insert - * @return instruction handle of the first inserted instruction - */ - public BranchHandle insert(final InstructionHandle ih, final BranchInstruction i) { - final BranchHandle bh = BranchHandle.getBranchHandle(i); - final InstructionList il = new InstructionList(); - il.append(bh); - insert(ih, il); - return bh; - } - - /** - * Take all instructions (handles) from "start" to "end" and append them after the new location "target". Of course, "end" must be after "start" and target - * must not be located withing this range. If you want to move something to the start of the list use null as value for target. - *

- * Any instruction targeters pointing to handles within the block, keep their targets. - *

- * - * @param start - * of moved block - * @param end - * of moved block - * @param target - * of moved block - */ - public void move(final InstructionHandle start, final InstructionHandle end, final InstructionHandle target) { - // Step 1: Check constraints - if ((start == null) || (end == null)) { - throw new ClassGenException("Invalid null handle: From " + start + " to " + end); - } - if ((target == start) || (target == end)) { - throw new ClassGenException("Invalid range: From " + start + " to " + end + " contains target " + target); - } - for (InstructionHandle ih = start; ih != end.getNext(); ih = ih.getNext()) { - if (ih == null) { - throw new ClassGenException("Invalid range: From " + start + " to " + end); - } else if (ih == target) { - throw new ClassGenException("Invalid range: From " + start + " to " + end + " contains target " + target); - } - } - // Step 2: Temporarily remove the given instructions from the list - final InstructionHandle prev = start.getPrev(); - InstructionHandle next = end.getNext(); - if (prev != null) { - prev.setNext(next); - } else { - this.start = next; - } - if (next != null) { - next.setPrev(prev); - } else { - this.end = prev; - } - start.setPrev(end.setNext(null)); - // Step 3: append after target - if (target == null) { // append to start of list - if (this.start != null) { - this.start.setPrev(end); - } - end.setNext(this.start); - this.start = start; - } else { - next = target.getNext(); - target.setNext(start); - start.setPrev(target); - end.setNext(next); - if (next != null) { - next.setPrev(end); - } else { - this.end = end; - } - } - } - - /** - * Move a single instruction (handle) to a new location. - * - * @param ih - * moved instruction - * @param target - * new location of moved instruction - */ - public void move(final InstructionHandle ih, final InstructionHandle target) { - move(ih, ih, target); - } - - /** - * Remove from instruction `prev' to instruction `next' both contained in this list. Throws TargetLostException when one of the removed instruction handles - * is still being targeted. - * - * @param prev - * where to start deleting (predecessor, exclusive) - * @param next - * where to end deleting (successor, exclusive) - */ - private void remove(final InstructionHandle prev, InstructionHandle next) throws TargetLostException { - InstructionHandle first; - InstructionHandle last; // First and last deleted instruction - if ((prev == null) && (next == null)) { - first = start; - last = end; - start = end = null; - } else { - if (prev == null) { // At start of list - first = start; - start = next; - } else { - first = prev.getNext(); - prev.setNext(next); - } - if (next == null) { // At end of list - last = end; - end = prev; - } else { - last = next.getPrev(); - next.setPrev(prev); - } - } - first.setPrev(null); // Completely separated from rest of list - last.setNext(null); - final List target_vec = new ArrayList<>(); - for (InstructionHandle ih = first; ih != null; ih = ih.getNext()) { - ih.getInstruction().dispose(); // e.g. BranchInstructions release their targets - } - final StringBuilder buf = new StringBuilder("{ "); - for (InstructionHandle ih = first; ih != null; ih = next) { - next = ih.getNext(); - length--; - if (ih.hasTargeters()) { // Still got targeters? - target_vec.add(ih); - buf.append(ih.toString(true)).append(" "); - ih.setNext(ih.setPrev(null)); - } else { - ih.dispose(); - } - } - buf.append("}"); - if (!target_vec.isEmpty()) { - final InstructionHandle[] targeted = new InstructionHandle[target_vec.size()]; - target_vec.toArray(targeted); - throw new TargetLostException(targeted, buf.toString()); - } - } - - /** - * Remove instruction from this list. The corresponding Instruction handles must not be reused! - * - * @param ih - * instruction (handle) to remove - */ - public void delete(final InstructionHandle ih) throws TargetLostException { - remove(ih.getPrev(), ih.getNext()); - } - - /** - * Remove instruction from this list. The corresponding Instruction handles must not be reused! - * - * @param i - * instruction to remove - */ - public void delete(final Instruction i) throws TargetLostException { - InstructionHandle ih; - if ((ih = findInstruction1(i)) == null) { - throw new ClassGenException("Instruction " + i + " is not contained in this list."); - } - delete(ih); - } - - /** - * Remove instructions from instruction `from' to instruction `to' contained in this list. The user must ensure that `from' is an instruction before `to', - * or risk havoc. The corresponding Instruction handles must not be reused! - * - * @param from - * where to start deleting (inclusive) - * @param to - * where to end deleting (inclusive) - */ - public void delete(final InstructionHandle from, final InstructionHandle to) throws TargetLostException { - remove(from.getPrev(), to.getNext()); - } - - /** - * Remove instructions from instruction `from' to instruction `to' contained in this list. The user must ensure that `from' is an instruction before `to', - * or risk havoc. The corresponding Instruction handles must not be reused! - * - * @param from - * where to start deleting (inclusive) - * @param to - * where to end deleting (inclusive) - */ - public void delete(final Instruction from, final Instruction to) throws TargetLostException { - InstructionHandle from_ih; - InstructionHandle to_ih; - if ((from_ih = findInstruction1(from)) == null) { - throw new ClassGenException("Instruction " + from + " is not contained in this list."); - } - if ((to_ih = findInstruction2(to)) == null) { - throw new ClassGenException("Instruction " + to + " is not contained in this list."); - } - delete(from_ih, to_ih); - } - - /** - * Search for given Instruction reference, start at beginning of list. - * - * @param i - * instruction to search for - * @return instruction found on success, null otherwise - */ - private InstructionHandle findInstruction1(final Instruction i) { - for (InstructionHandle ih = start; ih != null; ih = ih.getNext()) { - if (ih.getInstruction() == i) { - return ih; - } - } - return null; - } - - /** - * Search for given Instruction reference, start at end of list - * - * @param i - * instruction to search for - * @return instruction found on success, null otherwise - */ - private InstructionHandle findInstruction2(final Instruction i) { - for (InstructionHandle ih = end; ih != null; ih = ih.getPrev()) { - if (ih.getInstruction() == i) { - return ih; - } - } - return null; - } - - public boolean contains(final InstructionHandle i) { - if (i == null) { - return false; - } - for (InstructionHandle ih = start; ih != null; ih = ih.getNext()) { - if (ih == i) { - return true; - } - } - return false; - } - - public boolean contains(final Instruction i) { - return findInstruction1(i) != null; - } - - public void setPositions() { // TODO could be package-protected? (some test code would need to be repackaged) - setPositions(false); - } - - /** - * Give all instructions their position number (offset in byte stream), i.e., make the list ready to be dumped. - * - * @param check - * Perform sanity checks, e.g. if all targeted instructions really belong to this list - */ - public void setPositions(final boolean check) { // called by code in other packages - int max_additional_bytes = 0; - int additional_bytes = 0; - int index = 0; - int count = 0; - final int[] pos = new int[length]; - /* - * Pass 0: Sanity checks - */ - if (check) { - for (InstructionHandle ih = start; ih != null; ih = ih.getNext()) { - final Instruction i = ih.getInstruction(); - if (i instanceof BranchInstruction) { // target instruction within list? - Instruction inst = ((BranchInstruction) i).getTarget().getInstruction(); - if (!contains(inst)) { - throw new ClassGenException("Branch target of " + Const.getOpcodeName(i.getOpcode()) + ":" + inst + " not in instruction list"); - } - if (i instanceof Select) { - final InstructionHandle[] targets = ((Select) i).getTargets(); - for (final InstructionHandle target : targets) { - inst = target.getInstruction(); - if (!contains(inst)) { - throw new ClassGenException("Branch target of " + Const.getOpcodeName(i.getOpcode()) + ":" + inst + " not in instruction list"); - } - } - } - if (!(ih instanceof BranchHandle)) { - throw new ClassGenException( - "Branch instruction " + Const.getOpcodeName(i.getOpcode()) + ":" + inst + " not contained in BranchHandle."); - } - } - } - } - /* - * Pass 1: Set position numbers and sum up the maximum number of bytes an instruction may be shifted. - */ - for (InstructionHandle ih = start; ih != null; ih = ih.getNext()) { - final Instruction i = ih.getInstruction(); - ih.setPosition(index); - pos[count++] = index; - /* - * Get an estimate about how many additional bytes may be added, because BranchInstructions may have variable length depending on the target offset - * (short vs. int) or alignment issues (TABLESWITCH and LOOKUPSWITCH). - */ - switch (i.getOpcode()) { - case Const.JSR: - case Const.GOTO: - max_additional_bytes += 2; - break; - case Const.TABLESWITCH: - case Const.LOOKUPSWITCH: - max_additional_bytes += 3; - break; - } - index += i.getLength(); - } - /* - * Pass 2: Expand the variable-length (Branch)Instructions depending on the target offset (short or int) and ensure that branch targets are within this - * list. - */ - for (InstructionHandle ih = start; ih != null; ih = ih.getNext()) { - additional_bytes += ih.updatePosition(additional_bytes, max_additional_bytes); - } - /* - * Pass 3: Update position numbers (which may have changed due to the preceding expansions), like pass 1. - */ - index = count = 0; - for (InstructionHandle ih = start; ih != null; ih = ih.getNext()) { - final Instruction i = ih.getInstruction(); - ih.setPosition(index); - pos[count++] = index; - index += i.getLength(); - } - bytePositions = new int[count]; // Trim to proper size - System.arraycopy(pos, 0, bytePositions, 0, count); - } - - /** - * When everything is finished, use this method to convert the instruction list into an array of bytes. - * - * @return the byte code ready to be dumped - */ - public byte[] getByteCode() { - // Update position indices of instructions - setPositions(); - final ByteArrayOutputStream b = new ByteArrayOutputStream(); - final DataOutputStream out = new DataOutputStream(b); - try { - for (InstructionHandle ih = start; ih != null; ih = ih.getNext()) { - final Instruction i = ih.getInstruction(); - i.dump(out); // Traverse list - } - out.flush(); - } catch (final IOException e) { - System.err.println(e); - return new byte[0]; - } - return b.toByteArray(); - } - - /** - * @return an array of instructions without target information for branch instructions. - */ - public Instruction[] getInstructions() { - final List instructions = new ArrayList<>(); - try (ByteSequence bytes = new ByteSequence(getByteCode())) { - while (bytes.available() > 0) { - instructions.add(Instruction.readInstruction(bytes)); - } - } catch (final IOException e) { - throw new ClassGenException(e.toString(), e); - } - return instructions.toArray(new Instruction[instructions.size()]); - } - - @Override - public String toString() { - return toString(true); - } - - /** - * @param verbose - * toggle output format - * @return String containing all instructions in this list. - */ - public String toString(final boolean verbose) { - final StringBuilder buf = new StringBuilder(); - for (InstructionHandle ih = start; ih != null; ih = ih.getNext()) { - buf.append(ih.toString(verbose)).append("\n"); - } - return buf.toString(); - } - - /** - * @return iterator that lists all instructions (handles) - */ - @Override - public Iterator iterator() { - return new Iterator() { - - private InstructionHandle ih = start; - - @Override - public InstructionHandle next() throws NoSuchElementException { - if (ih == null) { - throw new NoSuchElementException(); - } - final InstructionHandle i = ih; - ih = ih.getNext(); - return i; - } - - @Override - public void remove() { - throw new UnsupportedOperationException(); - } - - @Override - public boolean hasNext() { - return ih != null; - } - }; - } - - /** - * @return array containing all instructions (handles) - */ - public InstructionHandle[] getInstructionHandles() { - final InstructionHandle[] ihs = new InstructionHandle[length]; - InstructionHandle ih = start; - for (int i = 0; i < length; i++) { - ihs[i] = ih; - ih = ih.getNext(); - } - return ihs; - } - - /** - * Get positions (offsets) of all instructions in the list. This relies on that the list has been freshly created from an byte code array, or that - * setPositions() has been called. Otherwise this may be inaccurate. - * - * @return array containing all instruction's offset in byte code - */ - public int[] getInstructionPositions() { - return bytePositions; - } - - /** - * @return complete, i.e., deep copy of this list - */ - public InstructionList copy() { - final Map map = new HashMap<>(); - final InstructionList il = new InstructionList(); - /* - * Pass 1: Make copies of all instructions, append them to the new list and associate old instruction references with the new ones, i.e., a 1:1 mapping. - */ - for (InstructionHandle ih = start; ih != null; ih = ih.getNext()) { - final Instruction i = ih.getInstruction(); - final Instruction c = i.copy(); // Use clone for shallow copy - if (c instanceof BranchInstruction) { - map.put(ih, il.append((BranchInstruction) c)); - } else { - map.put(ih, il.append(c)); - } - } - /* - * Pass 2: Update branch targets. - */ - InstructionHandle ih = start; - InstructionHandle ch = il.start; - while (ih != null) { - final Instruction i = ih.getInstruction(); - final Instruction c = ch.getInstruction(); - if (i instanceof BranchInstruction) { - final BranchInstruction bi = (BranchInstruction) i; - final BranchInstruction bc = (BranchInstruction) c; - final InstructionHandle itarget = bi.getTarget(); // old target - // New target is in hash map - bc.setTarget(map.get(itarget)); - if (bi instanceof Select) { // Either LOOKUPSWITCH or TABLESWITCH - final InstructionHandle[] itargets = ((Select) bi).getTargets(); - final InstructionHandle[] ctargets = ((Select) bc).getTargets(); - for (int j = 0; j < itargets.length; j++) { // Update all targets - ctargets[j] = map.get(itargets[j]); - } - } - } - ih = ih.getNext(); - ch = ch.getNext(); - } - return il; - } - - /** - * Replace all references to the old constant pool with references to the new constant pool - */ - public void replaceConstantPool(final ConstantPoolGen old_cp, final ConstantPoolGen new_cp) { - for (InstructionHandle ih = start; ih != null; ih = ih.getNext()) { - final Instruction i = ih.getInstruction(); - if (i instanceof CPInstruction) { - final CPInstruction ci = (CPInstruction) i; - final Constant c = old_cp.getConstant(ci.getIndex()); - ci.setIndex(new_cp.addConstant(c, old_cp)); - } - } - } - - private void clear() { - start = end = null; - length = 0; - } - - /** - * Delete contents of list. Provides better memory utilization, because the system then may reuse the instruction handles. This method is typically called - * right after {@link MethodGen#getMethod()}. - */ - public void dispose() { - // Traverse in reverse order, because ih.next is overwritten - for (InstructionHandle ih = end; ih != null; ih = ih.getPrev()) { - /* - * Causes BranchInstructions to release target and targeters, because it calls dispose() on the contained instruction. - */ - ih.dispose(); - } - clear(); - } - - /** - * @return start of list - */ - public InstructionHandle getStart() { - return start; - } - - /** - * @return end of list - */ - public InstructionHandle getEnd() { - return end; - } - - /** - * @return length of list (Number of instructions, not bytes) - */ - public int getLength() { - return length; - } - - /** - * @return length of list (Number of instructions, not bytes) - */ - public int size() { - return length; - } - - /** - * Redirect all references from old_target to new_target, i.e., update targets of branch instructions. - * - * @param old_target - * the old target instruction handle - * @param new_target - * the new target instruction handle - */ - public void redirectBranches(final InstructionHandle old_target, final InstructionHandle new_target) { - for (InstructionHandle ih = start; ih != null; ih = ih.getNext()) { - final Instruction i = ih.getInstruction(); - if (i instanceof BranchInstruction) { - final BranchInstruction b = (BranchInstruction) i; - final InstructionHandle target = b.getTarget(); - if (target == old_target) { - b.setTarget(new_target); - } - if (b instanceof Select) { // Either LOOKUPSWITCH or TABLESWITCH - final InstructionHandle[] targets = ((Select) b).getTargets(); - for (int j = 0; j < targets.length; j++) { - if (targets[j] == old_target) { - ((Select) b).setTarget(j, new_target); - } - } - } - } - } - } - - /** - * Redirect all references of local variables from old_target to new_target. - * - * @param lg - * array of local variables - * @param old_target - * the old target instruction handle - * @param new_target - * the new target instruction handle - * @see MethodGen - */ - public void redirectLocalVariables(final LocalVariableGen[] lg, final InstructionHandle old_target, final InstructionHandle new_target) { - for (final LocalVariableGen element : lg) { - final InstructionHandle start = element.getStart(); - final InstructionHandle end = element.getEnd(); - if (start == old_target) { - element.setStart(new_target); - } - if (end == old_target) { - element.setEnd(new_target); - } - } - } - - /** - * Redirect all references of exception handlers from old_target to new_target. - * - * @param exceptions - * array of exception handlers - * @param old_target - * the old target instruction handle - * @param new_target - * the new target instruction handle - * @see MethodGen - */ - public void redirectExceptionHandlers(final CodeExceptionGen[] exceptions, final InstructionHandle old_target, final InstructionHandle new_target) { - for (final CodeExceptionGen exception : exceptions) { - if (exception.getStartPC() == old_target) { - exception.setStartPC(new_target); - } - if (exception.getEndPC() == old_target) { - exception.setEndPC(new_target); - } - if (exception.getHandlerPC() == old_target) { - exception.setHandlerPC(new_target); - } - } - } - - private List observers; - - /** - * Add observer for this object. - */ - public void addObserver(final InstructionListObserver o) { - if (observers == null) { - observers = new ArrayList<>(); - } - observers.add(o); - } - - /** - * Remove observer for this object. - */ - public void removeObserver(final InstructionListObserver o) { - if (observers != null) { - observers.remove(o); - } - } - - /** - * Call notify() method on all observers. This method is not called automatically whenever the state has changed, but has to be called by the user after he - * has finished editing the object. - */ - public void update() { - if (observers != null) { - for (final InstructionListObserver observer : observers) { - observer.notify(this); - } - } - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/InstructionListObserver.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/InstructionListObserver.java deleted file mode 100644 index d25cb54e..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/InstructionListObserver.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * Implement this interface if you're interested in changes to an InstructionList object - * and register yourself with addObserver(). - * - */ -public interface InstructionListObserver { - - void notify( InstructionList list ); -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/InstructionTargeter.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/InstructionTargeter.java deleted file mode 100644 index 51e58035..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/InstructionTargeter.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package org.apache.bcel.generic; - -/** - * Denote that a class targets InstructionHandles within an InstructionList. Namely - * the following implementers: - * - * @see BranchHandle - * @see LocalVariableGen - * @see CodeExceptionGen - */ -public interface InstructionTargeter { - - /** - * Checks whether this targeter targets the specified instruction handle. - */ - boolean containsTarget(InstructionHandle ih); - - /** - * Replaces the target of this targeter from this old handle to the new handle. - * - * @param old_ih the old handle - * @param new_ih the new handle - * @throws ClassGenException if old_ih is not targeted by this object - */ - void updateTarget(InstructionHandle old_ih, InstructionHandle new_ih) throws ClassGenException; -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/InvokeInstruction.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/InvokeInstruction.java deleted file mode 100644 index f543a8ba..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/InvokeInstruction.java +++ /dev/null @@ -1,147 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import java.util.StringTokenizer; - -import org.apache.bcel.Const; -import org.apache.bcel.classfile.Constant; -import org.apache.bcel.classfile.ConstantCP; -import org.apache.bcel.classfile.ConstantPool; - -/** - * Super class for the INVOKExxx family of instructions. - * - */ -public abstract class InvokeInstruction extends FieldOrMethod implements ExceptionThrower, - StackConsumer, StackProducer { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - InvokeInstruction() { - } - - - /** - * @param index to constant pool - */ - protected InvokeInstruction(final short opcode, final int index) { - super(opcode, index); - } - - - /** - * @return mnemonic for instruction with symbolic references resolved - */ - @Override - public String toString( final ConstantPool cp ) { - final Constant c = cp.getConstant(super.getIndex()); - final StringTokenizer tok = new StringTokenizer(cp.constantToString(c)); - - final String opcodeName = Const.getOpcodeName(super.getOpcode()); - - final StringBuilder sb = new StringBuilder(opcodeName); - if (tok.hasMoreTokens()) { - sb.append(" "); - sb.append(tok.nextToken().replace('.', '/')); - if (tok.hasMoreTokens()) { - sb.append(tok.nextToken()); - } - } - - return sb.toString(); - } - - - /** - * Also works for instructions whose stack effect depends on the - * constant pool entry they reference. - * @return Number of words consumed from stack by this instruction - */ - @Override - public int consumeStack( final ConstantPoolGen cpg ) { - int sum; - if ((super.getOpcode() == Const.INVOKESTATIC) || (super.getOpcode() == Const.INVOKEDYNAMIC)) { - sum = 0; - } else { - sum = 1; // this reference - } - - final String signature = getSignature(cpg); - sum += Type.getArgumentTypesSize(signature); - return sum; - } - - - /** - * Also works for instructions whose stack effect depends on the - * constant pool entry they reference. - * @return Number of words produced onto stack by this instruction - */ - @Override - public int produceStack( final ConstantPoolGen cpg ) { - final String signature = getSignature(cpg); - return Type.getReturnTypeSize(signature); - } - - /** - * This overrides the deprecated version as we know here that the referenced class - * may legally be an array. - * - * @return name of the referenced class/interface - * @throws IllegalArgumentException if the referenced class is an array (this should not happen) - */ - @Override - public String getClassName( final ConstantPoolGen cpg ) { - final ConstantPool cp = cpg.getConstantPool(); - final ConstantCP cmr = (ConstantCP) cp.getConstant(super.getIndex()); - final String className = cp.getConstantString(cmr.getClassIndex(), Const.CONSTANT_Class); - return className.replace('/', '.'); - } - - /** @return return type of referenced method. - */ - @Override - public Type getType( final ConstantPoolGen cpg ) { - return getReturnType(cpg); - } - - - /** @return name of referenced method. - */ - public String getMethodName( final ConstantPoolGen cpg ) { - return getName(cpg); - } - - - /** @return return type of referenced method. - */ - public Type getReturnType( final ConstantPoolGen cpg ) { - return Type.getReturnType(getSignature(cpg)); - } - - - /** @return argument types of referenced method. - */ - public Type[] getArgumentTypes( final ConstantPoolGen cpg ) { - return Type.getArgumentTypes(getSignature(cpg)); - } - -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/JSR.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/JSR.java deleted file mode 100644 index ab4a85f3..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/JSR.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import java.io.DataOutputStream; -import java.io.IOException; - -/** - * JSR - Jump to subroutine - * - */ -public class JSR extends JsrInstruction implements VariableLengthInstruction { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - JSR() { - } - - - public JSR(final InstructionHandle target) { - super(org.apache.bcel.Const.JSR, target); - } - - - /** - * Dump instruction as byte code to stream out. - * @param out Output stream - */ - @Override - public void dump( final DataOutputStream out ) throws IOException { - super.setIndex(getTargetOffset()); - if (super.getOpcode() == org.apache.bcel.Const.JSR) { - super.dump(out); - } else { // JSR_W - super.setIndex(getTargetOffset()); - out.writeByte(super.getOpcode()); - out.writeInt(super.getIndex()); - } - } - - - @Override - protected int updatePosition( final int offset, final int max_offset ) { - final int i = getTargetOffset(); // Depending on old position value - setPosition(getPosition() + offset); // Position may be shifted by preceding expansions - if (Math.abs(i) >= (Short.MAX_VALUE - max_offset)) { // to large for short (estimate) - super.setOpcode(org.apache.bcel.Const.JSR_W); - final short old_length = (short) super.getLength(); - super.setLength(5); - return super.getLength() - old_length; - } - return 0; - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackProducer(this); - v.visitVariableLengthInstruction(this); - v.visitBranchInstruction(this); - v.visitJsrInstruction(this); - v.visitJSR(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/JSR_W.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/JSR_W.java deleted file mode 100644 index 12c99187..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/JSR_W.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.util.ByteSequence; - -/** - * JSR_W - Jump to subroutine - * - */ -public class JSR_W extends JsrInstruction { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - JSR_W() { - } - - - public JSR_W(final InstructionHandle target) { - super(org.apache.bcel.Const.JSR_W, target); - super.setLength(5); - } - - - /** - * Dump instruction as byte code to stream out. - * @param out Output stream - */ - @Override - public void dump( final DataOutputStream out ) throws IOException { - super.setIndex(getTargetOffset()); - out.writeByte(super.getOpcode()); - out.writeInt(super.getIndex()); - } - - - /** - * Read needed data (e.g. index) from file. - */ - @Override - protected void initFromFile( final ByteSequence bytes, final boolean wide ) throws IOException { - super.setIndex(bytes.readInt()); - super.setLength(5); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackProducer(this); - v.visitBranchInstruction(this); - v.visitJsrInstruction(this); - v.visitJSR_W(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/JsrInstruction.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/JsrInstruction.java deleted file mode 100644 index 55fb51dc..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/JsrInstruction.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * Super class for JSR - Jump to subroutine - * - */ -public abstract class JsrInstruction extends BranchInstruction implements UnconditionalBranch, - TypedInstruction, StackProducer { - - JsrInstruction(final short opcode, final InstructionHandle target) { - super(opcode, target); - } - - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - JsrInstruction() { - } - - - /** @return return address type - */ - @Override - public Type getType( final ConstantPoolGen cp ) { - return new ReturnaddressType(physicalSuccessor()); - } - - - /** - * Returns an InstructionHandle to the physical successor - * of this JsrInstruction. For this method to work, - * this JsrInstruction object must not be shared between - * multiple InstructionHandle objects! - * Formally, there must not be InstructionHandle objects - * i, j where i != j and i.getInstruction() == this == - * j.getInstruction(). - * @return an InstructionHandle to the "next" instruction that - * will be executed when RETurned from a subroutine. - */ - public InstructionHandle physicalSuccessor() { - InstructionHandle ih = super.getTarget(); - // Rewind! - while (ih.getPrev() != null) { - ih = ih.getPrev(); - } - // Find the handle for "this" JsrInstruction object. - while (ih.getInstruction() != this) { - ih = ih.getNext(); - } - final InstructionHandle toThis = ih; - while (ih != null) { - ih = ih.getNext(); - if ((ih != null) && (ih.getInstruction() == this)) { - throw new IllegalStateException("physicalSuccessor() called on a shared JsrInstruction."); - } - } - // Return the physical successor - return toThis.getNext(); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/L2D.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/L2D.java deleted file mode 100644 index d5278d91..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/L2D.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * L2D - Convert long to double - * 
Stack: ..., value.word1, value.word2 -> ..., result.word1, result.word2
- * - */ -public class L2D extends ConversionInstruction { - - public L2D() { - super(org.apache.bcel.Const.L2D); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitConversionInstruction(this); - v.visitL2D(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/L2F.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/L2F.java deleted file mode 100644 index b99bc09b..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/L2F.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * L2F - Convert long to float - * 
Stack: ..., value.word1, value.word2 -> ..., result
- * - */ -public class L2F extends ConversionInstruction { - - public L2F() { - super(org.apache.bcel.Const.L2F); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitConversionInstruction(this); - v.visitL2F(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/L2I.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/L2I.java deleted file mode 100644 index 120b76c2..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/L2I.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * L2I - Convert long to int - * 
Stack: ..., value.word1, value.word2 -> ..., result
- * - */ -public class L2I extends ConversionInstruction { - - public L2I() { - super(org.apache.bcel.Const.L2I); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitConversionInstruction(this); - v.visitL2I(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LADD.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LADD.java deleted file mode 100644 index 53670211..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LADD.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * LADD - Add longs - * 
Stack: ..., value1.word1, value1.word2, value2.word1, value2.word2 ->
- * ..., result.word1, result.word2 - * - */ -public class LADD extends ArithmeticInstruction { - - public LADD() { - super(org.apache.bcel.Const.LADD); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitArithmeticInstruction(this); - v.visitLADD(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LALOAD.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LALOAD.java deleted file mode 100644 index ce0a3861..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LALOAD.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * LALOAD - Load long from array - * 
Stack: ..., arrayref, index -> ..., value1, value2
- * - */ -public class LALOAD extends ArrayInstruction implements StackProducer { - - /** Load long from array - */ - public LALOAD() { - super(org.apache.bcel.Const.LALOAD); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackProducer(this); - v.visitExceptionThrower(this); - v.visitTypedInstruction(this); - v.visitArrayInstruction(this); - v.visitLALOAD(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LAND.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LAND.java deleted file mode 100644 index 408f1ee9..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LAND.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * LAND - Bitwise AND longs - * 
Stack: ..., value1.word1, value1.word2, value2.word1, value2.word2 ->
- * ..., result.word1, result.word2 - * - */ -public class LAND extends ArithmeticInstruction { - - public LAND() { - super(org.apache.bcel.Const.LAND); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitArithmeticInstruction(this); - v.visitLAND(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LASTORE.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LASTORE.java deleted file mode 100644 index f770319e..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LASTORE.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * LASTORE - Store into long array - * 
Stack: ..., arrayref, index, value.word1, value.word2 -> ...
- * - */ -public class LASTORE extends ArrayInstruction implements StackConsumer { - - /** Store long into array - */ - public LASTORE() { - super(org.apache.bcel.Const.LASTORE); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackConsumer(this); - v.visitExceptionThrower(this); - v.visitTypedInstruction(this); - v.visitArrayInstruction(this); - v.visitLASTORE(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LCMP.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LCMP.java deleted file mode 100644 index 0a10757c..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LCMP.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * LCMP - Compare longs: - * 
Stack: ..., value1.word1, value1.word2, value2.word1, value2.word2 -> ..., result <= -1, 0, 1>
- * - * - */ -public class LCMP extends Instruction implements TypedInstruction, StackProducer, StackConsumer { - - public LCMP() { - super(org.apache.bcel.Const.LCMP, (short) 1); - } - - - /** @return Type.LONG - */ - @Override - public Type getType( final ConstantPoolGen cp ) { - return Type.LONG; - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitLCMP(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LCONST.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LCONST.java deleted file mode 100644 index 4258ec63..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LCONST.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * LCONST - Push 0 or 1, other values cause an exception - * - * 
Stack: ... -> ...,
- * - */ -public class LCONST extends Instruction implements ConstantPushInstruction { - - private long value; - - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - LCONST() { - } - - - public LCONST(final long l) { - super(org.apache.bcel.Const.LCONST_0, (short) 1); - if (l == 0) { - super.setOpcode(org.apache.bcel.Const.LCONST_0); - } else if (l == 1) { - super.setOpcode(org.apache.bcel.Const.LCONST_1); - } else { - throw new ClassGenException("LCONST can be used only for 0 and 1: " + l); - } - value = l; - } - - - @Override - public Number getValue() { - return Long.valueOf(value); - } - - - /** @return Type.LONG - */ - @Override - public Type getType( final ConstantPoolGen cp ) { - return Type.LONG; - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitPushInstruction(this); - v.visitStackProducer(this); - v.visitTypedInstruction(this); - v.visitConstantPushInstruction(this); - v.visitLCONST(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LDC.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LDC.java deleted file mode 100644 index b324ae95..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LDC.java +++ /dev/null @@ -1,156 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.ExceptionConst; -import org.apache.bcel.util.ByteSequence; - -/** - * LDC - Push item from constant pool. - * - * 
Stack: ... -> ..., item
- * - */ -public class LDC extends CPInstruction implements PushInstruction, ExceptionThrower { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - LDC() { - } - - - public LDC(final int index) { - super(org.apache.bcel.Const.LDC_W, index); - setSize(); - } - - - // Adjust to proper size - protected final void setSize() { - if (super.getIndex() <= org.apache.bcel.Const.MAX_BYTE) { // Fits in one byte? - super.setOpcode(org.apache.bcel.Const.LDC); - super.setLength(2); - } else { - super.setOpcode(org.apache.bcel.Const.LDC_W); - super.setLength(3); - } - } - - - /** - * Dump instruction as byte code to stream out. - * @param out Output stream - */ - @Override - public void dump( final DataOutputStream out ) throws IOException { - out.writeByte(super.getOpcode()); - if (super.getLength() == 2) { // TODO useless check? - out.writeByte(super.getIndex()); - } else { - out.writeShort(super.getIndex()); - } - } - - - /** - * Set the index to constant pool and adjust size. - */ - @Override - public final void setIndex( final int index ) { - super.setIndex(index); - setSize(); - } - - - /** - * Read needed data (e.g. index) from file. - */ - @Override - protected void initFromFile( final ByteSequence bytes, final boolean wide ) throws IOException { - super.setLength(2); - super.setIndex(bytes.readUnsignedByte()); - } - - - public Object getValue( final ConstantPoolGen cpg ) { - org.apache.bcel.classfile.Constant c = cpg.getConstantPool().getConstant(super.getIndex()); - switch (c.getTag()) { - case org.apache.bcel.Const.CONSTANT_String: - final int i = ((org.apache.bcel.classfile.ConstantString) c).getStringIndex(); - c = cpg.getConstantPool().getConstant(i); - return ((org.apache.bcel.classfile.ConstantUtf8) c).getBytes(); - case org.apache.bcel.Const.CONSTANT_Float: - return new Float(((org.apache.bcel.classfile.ConstantFloat) c).getBytes()); - case org.apache.bcel.Const.CONSTANT_Integer: - return Integer.valueOf(((org.apache.bcel.classfile.ConstantInteger) c).getBytes()); - case org.apache.bcel.Const.CONSTANT_Class: - final int nameIndex = ((org.apache.bcel.classfile.ConstantClass) c).getNameIndex(); - c = cpg.getConstantPool().getConstant(nameIndex); - return new ObjectType(((org.apache.bcel.classfile.ConstantUtf8) c).getBytes()); - default: // Never reached - throw new IllegalArgumentException("Unknown or invalid constant type at " + super.getIndex()); - } - } - - - @Override - public Type getType( final ConstantPoolGen cpg ) { - switch (cpg.getConstantPool().getConstant(super.getIndex()).getTag()) { - case org.apache.bcel.Const.CONSTANT_String: - return Type.STRING; - case org.apache.bcel.Const.CONSTANT_Float: - return Type.FLOAT; - case org.apache.bcel.Const.CONSTANT_Integer: - return Type.INT; - case org.apache.bcel.Const.CONSTANT_Class: - return Type.CLASS; - default: // Never reached - throw new IllegalArgumentException("Unknown or invalid constant type at " + super.getIndex()); - } - } - - - @Override - public Class[] getExceptions() { - return ExceptionConst.createExceptions(ExceptionConst.EXCS.EXCS_STRING_RESOLUTION); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackProducer(this); - v.visitPushInstruction(this); - v.visitExceptionThrower(this); - v.visitTypedInstruction(this); - v.visitCPInstruction(this); - v.visitLDC(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LDC2_W.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LDC2_W.java deleted file mode 100644 index 4dd64d9d..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LDC2_W.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * LDC2_W - Push long or double from constant pool - * - * 
Stack: ... -> ..., item.word1, item.word2
- * - */ -public class LDC2_W extends CPInstruction implements PushInstruction { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - LDC2_W() { - } - - - public LDC2_W(final int index) { - super(org.apache.bcel.Const.LDC2_W, index); - } - - - @Override - public Type getType( final ConstantPoolGen cpg ) { - switch (cpg.getConstantPool().getConstant(super.getIndex()).getTag()) { - case org.apache.bcel.Const.CONSTANT_Long: - return Type.LONG; - case org.apache.bcel.Const.CONSTANT_Double: - return Type.DOUBLE; - default: // Never reached - throw new IllegalArgumentException("Unknown constant type " + super.getOpcode()); - } - } - - - public Number getValue( final ConstantPoolGen cpg ) { - final org.apache.bcel.classfile.Constant c = cpg.getConstantPool().getConstant(super.getIndex()); - switch (c.getTag()) { - case org.apache.bcel.Const.CONSTANT_Long: - return Long.valueOf(((org.apache.bcel.classfile.ConstantLong) c).getBytes()); - case org.apache.bcel.Const.CONSTANT_Double: - return new Double(((org.apache.bcel.classfile.ConstantDouble) c).getBytes()); - default: // Never reached - throw new IllegalArgumentException("Unknown or invalid constant type at " + super.getIndex()); - } - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackProducer(this); - v.visitPushInstruction(this); - v.visitTypedInstruction(this); - v.visitCPInstruction(this); - v.visitLDC2_W(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LDC_W.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LDC_W.java deleted file mode 100644 index 6bf30fd8..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LDC_W.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import java.io.IOException; - -import org.apache.bcel.util.ByteSequence; - -/** - * LDC_W - Push item from constant pool (wide index) - * - * 
Stack: ... -> ..., item.word1, item.word2
- * - */ -public class LDC_W extends LDC { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - LDC_W() { - } - - - public LDC_W(final int index) { - super(index); - } - - - /** - * Read needed data (i.e., index) from file. - */ - @Override - protected void initFromFile( final ByteSequence bytes, final boolean wide ) throws IOException { - setIndex(bytes.readUnsignedShort()); - // Override just in case it has been changed - super.setOpcode(org.apache.bcel.Const.LDC_W); - super.setLength(3); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LDIV.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LDIV.java deleted file mode 100644 index b0724e29..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LDIV.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import org.apache.bcel.ExceptionConst; - -/** - * LDIV - Divide longs - * 
Stack: ..., value1.word1, value1.word2, value2.word1, value2.word2 ->
- * ..., result.word1, result.word2 - * - */ -public class LDIV extends ArithmeticInstruction implements ExceptionThrower { - - public LDIV() { - super(org.apache.bcel.Const.LDIV); - } - - - @Override - public Class[] getExceptions() { - return new Class[] { - ExceptionConst.ARITHMETIC_EXCEPTION - }; - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitExceptionThrower(this); - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitArithmeticInstruction(this); - v.visitLDIV(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LLOAD.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LLOAD.java deleted file mode 100644 index 878f33dc..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LLOAD.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * LLOAD - Load long from local variable - *
Stack ... -> ..., result.word1, result.word2
- * - */ -public class LLOAD extends LoadInstruction { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - LLOAD() { - super(org.apache.bcel.Const.LLOAD, org.apache.bcel.Const.LLOAD_0); - } - - - public LLOAD(final int n) { - super(org.apache.bcel.Const.LLOAD, org.apache.bcel.Const.LLOAD_0, n); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - super.accept(v); - v.visitLLOAD(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LMUL.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LMUL.java deleted file mode 100644 index 858afa81..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LMUL.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * LMUL - Multiply longs - * 
Stack: ..., value1.word1, value1.word2, value2.word1, value2.word2 ->
- * ..., result.word1, result.word2 - * - */ -public class LMUL extends ArithmeticInstruction { - - public LMUL() { - super(org.apache.bcel.Const.LMUL); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitArithmeticInstruction(this); - v.visitLMUL(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LNEG.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LNEG.java deleted file mode 100644 index 9d3765aa..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LNEG.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * LNEG - Negate long - * 
Stack: ..., value.word1, value.word2 -> ..., result.word1, result.word2
- * - */ -public class LNEG extends ArithmeticInstruction { - - public LNEG() { - super(org.apache.bcel.Const.LNEG); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitArithmeticInstruction(this); - v.visitLNEG(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LOOKUPSWITCH.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LOOKUPSWITCH.java deleted file mode 100644 index ec11051b..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LOOKUPSWITCH.java +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.util.ByteSequence; - -/** - * LOOKUPSWITCH - Switch with unordered set of values - * - * @see SWITCH - */ -public class LOOKUPSWITCH extends Select { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - LOOKUPSWITCH() { - } - - - public LOOKUPSWITCH(final int[] match, final InstructionHandle[] targets, final InstructionHandle defaultTarget) { - super(org.apache.bcel.Const.LOOKUPSWITCH, match, targets, defaultTarget); - /* alignment remainder assumed 0 here, until dump time. */ - final short _length = (short) (9 + getMatch_length() * 8); - super.setLength(_length); - setFixed_length(_length); - } - - - /** - * Dump instruction as byte code to stream out. - * @param out Output stream - */ - @Override - public void dump( final DataOutputStream out ) throws IOException { - super.dump(out); - final int _match_length = getMatch_length(); - out.writeInt(_match_length); // npairs - for (int i = 0; i < _match_length; i++) { - out.writeInt(super.getMatch(i)); // match-offset pairs - out.writeInt(setIndices(i, getTargetOffset(super.getTarget(i)))); - } - } - - - /** - * Read needed data (e.g. index) from file. - */ - @Override - protected void initFromFile( final ByteSequence bytes, final boolean wide ) throws IOException { - super.initFromFile(bytes, wide); // reads padding - final int _match_length = bytes.readInt(); - setMatch_length(_match_length); - final short _fixed_length = (short) (9 + _match_length * 8); - setFixed_length(_fixed_length); - final short _length = (short) (_match_length + super.getPadding()); - super.setLength(_length); - super.setMatches(new int[_match_length]); - super.setIndices(new int[_match_length]); - super.setTargets(new InstructionHandle[_match_length]); - for (int i = 0; i < _match_length; i++) { - super.setMatch(i, bytes.readInt()); - super.setIndices(i, bytes.readInt()); - } - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitVariableLengthInstruction(this); - v.visitStackConsumer(this); - v.visitBranchInstruction(this); - v.visitSelect(this); - v.visitLOOKUPSWITCH(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LOR.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LOR.java deleted file mode 100644 index 6481b78b..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LOR.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * LOR - Bitwise OR long - * 
Stack: ..., value1, value2 -> ..., result
- * - */ -public class LOR extends ArithmeticInstruction { - - public LOR() { - super(org.apache.bcel.Const.LOR); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitArithmeticInstruction(this); - v.visitLOR(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LREM.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LREM.java deleted file mode 100644 index 31d71be9..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LREM.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import org.apache.bcel.ExceptionConst; - -/** - * LREM - Remainder of long - * 
Stack: ..., value1, value2 -> result
- * - */ -public class LREM extends ArithmeticInstruction implements ExceptionThrower { - - public LREM() { - super(org.apache.bcel.Const.LREM); - } - - - @Override - public Class[] getExceptions() { - return new Class[] { - ExceptionConst.ARITHMETIC_EXCEPTION - }; - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitExceptionThrower(this); - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitArithmeticInstruction(this); - v.visitLREM(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LRETURN.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LRETURN.java deleted file mode 100644 index 27ca6526..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LRETURN.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * LRETURN - Return long from method - * 
Stack: ..., value.word1, value.word2 -> <empty>
- * - */ -public class LRETURN extends ReturnInstruction { - - public LRETURN() { - super(org.apache.bcel.Const.LRETURN); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitExceptionThrower(this); - v.visitTypedInstruction(this); - v.visitStackConsumer(this); - v.visitReturnInstruction(this); - v.visitLRETURN(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LSHL.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LSHL.java deleted file mode 100644 index aaa4e956..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LSHL.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * LSHL - Arithmetic shift left long - * 
Stack: ..., value1.word1, value1.word2, value2 -> ..., result.word1, result.word2
- * - */ -public class LSHL extends ArithmeticInstruction { - - public LSHL() { - super(org.apache.bcel.Const.LSHL); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitArithmeticInstruction(this); - v.visitLSHL(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LSHR.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LSHR.java deleted file mode 100644 index a1f8137b..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LSHR.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * LSHR - Arithmetic shift right long - * 
Stack: ..., value1.word1, value1.word2, value2 -> ..., result.word1, result.word2
- * - */ -public class LSHR extends ArithmeticInstruction { - - public LSHR() { - super(org.apache.bcel.Const.LSHR); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitArithmeticInstruction(this); - v.visitLSHR(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LSTORE.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LSTORE.java deleted file mode 100644 index f7839721..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LSTORE.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * LSTORE - Store long into local variable - * 
Stack: ..., value.word1, value.word2 -> ...
- * - */ -public class LSTORE extends StoreInstruction { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - LSTORE() { - super(org.apache.bcel.Const.LSTORE, org.apache.bcel.Const.LSTORE_0); - } - - - public LSTORE(final int n) { - super(org.apache.bcel.Const.LSTORE, org.apache.bcel.Const.LSTORE_0, n); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - super.accept(v); - v.visitLSTORE(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LSUB.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LSUB.java deleted file mode 100644 index d406916c..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LSUB.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * LSUB - Substract longs - * 
Stack: ..., value1.word1, value1.word2, value2.word1, value2.word2 ->
- * ..., result.word1, result.word2 - * - */ -public class LSUB extends ArithmeticInstruction { - - public LSUB() { - super(org.apache.bcel.Const.LSUB); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitArithmeticInstruction(this); - v.visitLSUB(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LUSHR.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LUSHR.java deleted file mode 100644 index 5391f7f1..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LUSHR.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * LUSHR - Logical shift right long - * 
Stack: ..., value1, value2 -> ..., result
- * - */ -public class LUSHR extends ArithmeticInstruction { - - public LUSHR() { - super(org.apache.bcel.Const.LUSHR); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitArithmeticInstruction(this); - v.visitLUSHR(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LXOR.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LXOR.java deleted file mode 100644 index a213f1c6..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LXOR.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * LXOR - Bitwise XOR long - * 
Stack: ..., value1, value2 -> ..., result
- * - */ -public class LXOR extends ArithmeticInstruction { - - public LXOR() { - super(org.apache.bcel.Const.LXOR); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitTypedInstruction(this); - v.visitStackProducer(this); - v.visitStackConsumer(this); - v.visitArithmeticInstruction(this); - v.visitLXOR(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LineNumberGen.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LineNumberGen.java deleted file mode 100644 index ff40cede..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LineNumberGen.java +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import java.util.Objects; - -import org.apache.bcel.classfile.LineNumber; - -/** - * This class represents a line number within a method, i.e., give an instruction - * a line number corresponding to the source code line. - * - * @see LineNumber - * @see MethodGen - */ -public class LineNumberGen implements InstructionTargeter, Cloneable { - - private InstructionHandle ih; - private int srcLine; - - /** - * Create a line number. - * - * @param ih instruction handle to reference - */ - public LineNumberGen(final InstructionHandle ih, final int src_line) { - setInstruction(ih); - setSourceLine(src_line); - } - - - /** - * @return true, if ih is target of this line number - */ - @Override - public boolean containsTarget( final InstructionHandle ih ) { - return this.ih == ih; - } - - - /** - * @param old_ih old target - * @param new_ih new target - */ - @Override - public void updateTarget( final InstructionHandle old_ih, final InstructionHandle new_ih ) { - if (old_ih != ih) { - throw new ClassGenException("Not targeting " + old_ih + ", but " + ih + "}"); - } - setInstruction(new_ih); - } - - - /** - * Get LineNumber attribute . - * - * This relies on that the instruction list has already been dumped to byte code or - * or that the `setPositions' methods has been called for the instruction list. - */ - public LineNumber getLineNumber() { - return new LineNumber(ih.getPosition(), srcLine); - } - - - public void setInstruction( final InstructionHandle instructionHandle ) { // TODO could be package-protected? - Objects.requireNonNull(instructionHandle, "instructionHandle"); - BranchInstruction.notifyTarget(this.ih, instructionHandle, this); - this.ih = instructionHandle; - } - - - @Override - public Object clone() { - try { - return super.clone(); - } catch (final CloneNotSupportedException e) { - throw new Error("Clone Not Supported"); // never happens - } - } - - - public InstructionHandle getInstruction() { - return ih; - } - - - public void setSourceLine( final int src_line ) { // TODO could be package-protected? - this.srcLine = src_line; - } - - - public int getSourceLine() { - return srcLine; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LoadClass.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LoadClass.java deleted file mode 100644 index 92937047..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LoadClass.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * Denotes that an instruction may start the process of loading and resolving - * the referenced class in the Virtual Machine. - * - */ -public interface LoadClass { - - /** - * Returns the ObjectType of the referenced class or interface - * that may be loaded and resolved. - * @return object type that may be loaded or null if a primitive is - * referenced - */ - ObjectType getLoadClassType( ConstantPoolGen cpg ); - - - /** - * Returns the type associated with this instruction. - * LoadClass instances are always typed, but this type - * does not always refer to the type of the class or interface - * that it possibly forces to load. For example, GETFIELD would - * return the type of the field and not the type of the class - * where the field is defined. - * If no class is forced to be loaded, null is returned. - * An example for this is an ANEWARRAY instruction that creates - * an int[][]. - * @see #getLoadClassType(ConstantPoolGen) - */ - Type getType( ConstantPoolGen cpg ); -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LoadInstruction.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LoadInstruction.java deleted file mode 100644 index 4b920ad4..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LoadInstruction.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * Denotes an unparameterized instruction to load a value from a local - * variable, e.g. ILOAD. - * - */ -public abstract class LoadInstruction extends LocalVariableInstruction implements PushInstruction { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - * tag and length are defined in readInstruction and initFromFile, respectively. - */ - LoadInstruction(final short canon_tag, final short c_tag) { - super(canon_tag, c_tag); - } - - - /** - * @param opcode Instruction opcode - * @param c_tag Instruction number for compact version, ALOAD_0, e.g. - * @param n local variable index (unsigned short) - */ - protected LoadInstruction(final short opcode, final short c_tag, final int n) { - super(opcode, c_tag, n); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackProducer(this); - v.visitPushInstruction(this); - v.visitTypedInstruction(this); - v.visitLocalVariableInstruction(this); - v.visitLoadInstruction(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LocalVariableGen.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LocalVariableGen.java deleted file mode 100644 index 2a89c199..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LocalVariableGen.java +++ /dev/null @@ -1,262 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import org.apache.bcel.Const; -import org.apache.bcel.classfile.LocalVariable; - -/** - * Represents a local variable within a method. It contains its - * scope, name and type. The generated LocalVariable object can be obtained - * with getLocalVariable which needs the instruction list and the constant - * pool as parameters. - * - * @see LocalVariable - * @see MethodGen - */ -public class LocalVariableGen implements InstructionTargeter, NamedAndTyped, Cloneable { - - private int index; - private String name; - private Type type; - private InstructionHandle start; - private InstructionHandle end; - private int origIndex; // never changes; used to match up with LocalVariableTypeTable entries - private boolean liveToEnd; - - - /** - * Generate a local variable that with index `index'. Note that double and long - * variables need two indexs. Index indices have to be provided by the user. - * - * @param index index of local variable - * @param name its name - * @param type its type - * @param start from where the instruction is valid (null means from the start) - * @param end until where the instruction is valid (null means to the end) - */ - public LocalVariableGen(final int index, final String name, final Type type, final InstructionHandle start, - final InstructionHandle end) { - if ((index < 0) || (index > Const.MAX_SHORT)) { - throw new ClassGenException("Invalid index index: " + index); - } - this.name = name; - this.type = type; - this.index = index; - setStart(start); - setEnd(end); - this.origIndex = index; - this.liveToEnd = end == null; - } - - - /** - * Generates a local variable that with index `index'. Note that double and long - * variables need two indexs. Index indices have to be provided by the user. - * - * @param index index of local variable - * @param name its name - * @param type its type - * @param start from where the instruction is valid (null means from the start) - * @param end until where the instruction is valid (null means to the end) - * @param origIndex index of local variable prior to any changes to index - */ - public LocalVariableGen(final int index, final String name, final Type type, final InstructionHandle start, - final InstructionHandle end, final int origIndex) { - this(index, name, type, start, end); - this.origIndex = origIndex; - } - - - /** - * Gets LocalVariable object. - * - * This relies on that the instruction list has already been dumped to byte code or - * or that the `setPositions' methods has been called for the instruction list. - * - * Note that due to the conversion from byte code offset to InstructionHandle, - * it is impossible to tell the difference between a live range that ends BEFORE - * the last insturction of the method or a live range that ends AFTER the last - * instruction of the method. Hence the liveToEnd flag to differentiate - * between these two cases. - * - * @param cp constant pool - */ - public LocalVariable getLocalVariable( final ConstantPoolGen cp ) { - int start_pc = 0; - int length = 0; - if ((start != null) && (end != null)) { - start_pc = start.getPosition(); - length = end.getPosition() - start_pc; - if ((end.getNext() == null) && liveToEnd) { - length += end.getInstruction().getLength(); - } - } - final int name_index = cp.addUtf8(name); - final int signature_index = cp.addUtf8(type.getSignature()); - return new LocalVariable(start_pc, length, name_index, signature_index, index, cp - .getConstantPool(), origIndex); - } - - - public void setIndex( final int index ) { - this.index = index; - } - - - public int getIndex() { - return index; - } - - - public int getOrigIndex() { - return origIndex; - } - - - public void setLiveToEnd( final boolean live_to_end) { - this.liveToEnd = live_to_end; - } - - - public boolean getLiveToEnd() { - return liveToEnd; - } - - - @Override - public void setName( final String name ) { - this.name = name; - } - - - @Override - public String getName() { - return name; - } - - - @Override - public void setType( final Type type ) { - this.type = type; - } - - - @Override - public Type getType() { - return type; - } - - - public InstructionHandle getStart() { - return start; - } - - - public InstructionHandle getEnd() { - return end; - } - - - public void setStart( final InstructionHandle start ) { // TODO could be package-protected? - BranchInstruction.notifyTarget(this.start, start, this); - this.start = start; - } - - - public void setEnd( final InstructionHandle end ) { // TODO could be package-protected? - BranchInstruction.notifyTarget(this.end, end, this); - this.end = end; - } - - - /** - * @param old_ih old target, either start or end - * @param new_ih new target - */ - @Override - public void updateTarget( final InstructionHandle old_ih, final InstructionHandle new_ih ) { - boolean targeted = false; - if (start == old_ih) { - targeted = true; - setStart(new_ih); - } - if (end == old_ih) { - targeted = true; - setEnd(new_ih); - } - if (!targeted) { - throw new ClassGenException("Not targeting " + old_ih + ", but {" + start + ", " + end - + "}"); - } - } - - /** - * Clear the references from and to this variable when it's removed. - */ - void dispose() { - setStart(null); - setEnd(null); - } - - /** - * @return true, if ih is target of this variable - */ - @Override - public boolean containsTarget( final InstructionHandle ih ) { - return (start == ih) || (end == ih); - } - - - @Override - public int hashCode() { - // If the user changes the name or type, problems with the targeter hashmap will occur. - // Note: index cannot be part of hash as it may be changed by the user. - return name.hashCode() ^ type.hashCode(); - } - - - /** - * We consider to local variables to be equal, if the use the same index and - * are valid in the same range. - */ - @Override - public boolean equals( final Object o ) { - if (!(o instanceof LocalVariableGen)) { - return false; - } - final LocalVariableGen l = (LocalVariableGen) o; - return (l.index == index) && (l.start == start) && (l.end == end); - } - - - @Override - public String toString() { - return "LocalVariableGen(" + name + ", " + type + ", " + start + ", " + end + ")"; - } - - - @Override - public Object clone() { - try { - return super.clone(); - } catch (final CloneNotSupportedException e) { - throw new Error("Clone Not Supported"); // never happens - } - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LocalVariableInstruction.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LocalVariableInstruction.java deleted file mode 100644 index 2dbab3bc..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/LocalVariableInstruction.java +++ /dev/null @@ -1,231 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.Const; -import org.apache.bcel.util.ByteSequence; - -/** - * Abstract super class for instructions dealing with local variables. - * - */ -public abstract class LocalVariableInstruction extends Instruction implements TypedInstruction, - IndexedInstruction { - - /** - * @deprecated (since 6.0) will be made private; do not access directly, use getter/setter - */ - @Deprecated - protected int n = -1; // index of referenced variable - - private short cTag = -1; // compact version, such as ILOAD_0 - private short canonTag = -1; // canonical tag such as ILOAD - - - private boolean wide() { - return n > Const.MAX_BYTE; - } - - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - * tag and length are defined in readInstruction and initFromFile, respectively. - */ - LocalVariableInstruction(final short canon_tag, final short c_tag) { - super(); - this.canonTag = canon_tag; - this.cTag = c_tag; - } - - - /** - * Empty constructor needed for Instruction.readInstruction. - * Also used by IINC()! - */ - LocalVariableInstruction() { - } - - - /** - * @param opcode Instruction opcode - * @param cTag Instruction number for compact version, ALOAD_0, e.g. - * @param n local variable index (unsigned short) - */ - protected LocalVariableInstruction(final short opcode, final short cTag, final int n) { - super(opcode, (short) 2); - this.cTag = cTag; - canonTag = opcode; - setIndex(n); - } - - - /** - * Dump instruction as byte code to stream out. - * @param out Output stream - */ - @Override - public void dump( final DataOutputStream out ) throws IOException { - if (wide()) { - out.writeByte(Const.WIDE); - } - out.writeByte(super.getOpcode()); - if (super.getLength() > 1) { // Otherwise ILOAD_n, instruction, e.g. - if (wide()) { - out.writeShort(n); - } else { - out.writeByte(n); - } - } - } - - - /** - * Long output format: - * - * <name of opcode> "["<opcode number>"]" - * "("<length of instruction>")" "<"< local variable index>">" - * - * @param verbose long/short format switch - * @return mnemonic for instruction - */ - @Override - public String toString( final boolean verbose ) { - final short _opcode = super.getOpcode(); - if (((_opcode >= Const.ILOAD_0) && (_opcode <= Const.ALOAD_3)) - || ((_opcode >= Const.ISTORE_0) && (_opcode <= Const.ASTORE_3))) { - return super.toString(verbose); - } - return super.toString(verbose) + " " + n; - } - - - /** - * Read needed data (e.g. index) from file. - * 
-     * (ILOAD <= tag <= ALOAD_3) || (ISTORE <= tag <= ASTORE_3)
-     *
- */ - @Override - protected void initFromFile( final ByteSequence bytes, final boolean wide ) throws IOException { - if (wide) { - n = bytes.readUnsignedShort(); - super.setLength(4); - } else { - final short _opcode = super.getOpcode(); - if (((_opcode >= Const.ILOAD) && (_opcode <= Const.ALOAD)) - || ((_opcode >= Const.ISTORE) && (_opcode <= Const.ASTORE))) { - n = bytes.readUnsignedByte(); - super.setLength(2); - } else if (_opcode <= Const.ALOAD_3) { // compact load instruction such as ILOAD_2 - n = (_opcode - Const.ILOAD_0) % 4; - super.setLength(1); - } else { // Assert ISTORE_0 <= tag <= ASTORE_3 - n = (_opcode - Const.ISTORE_0) % 4; - super.setLength(1); - } - } - } - - - /** - * @return local variable index (n) referred by this instruction. - */ - @Override - public final int getIndex() { - return n; - } - - - /** - * Set the local variable index. - * also updates opcode and length - * TODO Why? - * @see #setIndexOnly(int) - */ - @Override - public void setIndex( final int n ) { // TODO could be package-protected? - if ((n < 0) || (n > Const.MAX_SHORT)) { - throw new ClassGenException("Illegal value: " + n); - } - this.n = n; - // Cannot be < 0 as this is checked above - if (n <= 3) { // Use more compact instruction xLOAD_n - super.setOpcode((short) (cTag + n)); - super.setLength(1); - } else { - super.setOpcode(canonTag); - if (wide()) { - super.setLength(4); - } else { - super.setLength(2); - } - } - } - - - /** @return canonical tag for instruction, e.g., ALOAD for ALOAD_0 - */ - public short getCanonicalTag() { - return canonTag; - } - - - /** - * Returns the type associated with the instruction - - * in case of ALOAD or ASTORE Type.OBJECT is returned. - * This is just a bit incorrect, because ALOAD and ASTORE - * may work on every ReferenceType (including Type.NULL) and - * ASTORE may even work on a ReturnaddressType . - * @return type associated with the instruction - */ - @Override - public Type getType( final ConstantPoolGen cp ) { - switch (canonTag) { - case Const.ILOAD: - case Const.ISTORE: - return Type.INT; - case Const.LLOAD: - case Const.LSTORE: - return Type.LONG; - case Const.DLOAD: - case Const.DSTORE: - return Type.DOUBLE; - case Const.FLOAD: - case Const.FSTORE: - return Type.FLOAT; - case Const.ALOAD: - case Const.ASTORE: - return Type.OBJECT; - default: - throw new ClassGenException("Unknown case in switch" + canonTag); - } - } - - /** - * Sets the index of the referenced variable (n) only - * @since 6.0 - * @see #setIndex(int) - */ - final void setIndexOnly(final int n) { - this.n = n; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/MONITORENTER.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/MONITORENTER.java deleted file mode 100644 index 39dec259..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/MONITORENTER.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import org.apache.bcel.ExceptionConst; - -/** - * MONITORENTER - Enter monitor for object - * 
Stack: ..., objectref -> ...
- * - */ -public class MONITORENTER extends Instruction implements ExceptionThrower, StackConsumer { - - public MONITORENTER() { - super(org.apache.bcel.Const.MONITORENTER, (short) 1); - } - - - @Override - public Class[] getExceptions() { - return new Class[] { - ExceptionConst.NULL_POINTER_EXCEPTION - }; - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitExceptionThrower(this); - v.visitStackConsumer(this); - v.visitMONITORENTER(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/MONITOREXIT.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/MONITOREXIT.java deleted file mode 100644 index 102a2d87..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/MONITOREXIT.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import org.apache.bcel.ExceptionConst; - -/** - * MONITOREXIT - Exit monitor for object - * 
Stack: ..., objectref -> ...
- * - */ -public class MONITOREXIT extends Instruction implements ExceptionThrower, StackConsumer { - - public MONITOREXIT() { - super(org.apache.bcel.Const.MONITOREXIT, (short) 1); - } - - - @Override - public Class[] getExceptions() { - return new Class[] { - ExceptionConst.NULL_POINTER_EXCEPTION - }; - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitExceptionThrower(this); - v.visitStackConsumer(this); - v.visitMONITOREXIT(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/MULTIANEWARRAY.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/MULTIANEWARRAY.java deleted file mode 100644 index 3d900224..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/MULTIANEWARRAY.java +++ /dev/null @@ -1,151 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.ExceptionConst; -import org.apache.bcel.classfile.ConstantPool; -import org.apache.bcel.util.ByteSequence; - -/** - * MULTIANEWARRAY - Create new mutidimensional array of references - * 
Stack: ..., count1, [count2, ...] -> ..., arrayref
- * - */ -public class MULTIANEWARRAY extends CPInstruction implements LoadClass, AllocationInstruction, - ExceptionThrower { - - private short dimensions; - - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - MULTIANEWARRAY() { - } - - - public MULTIANEWARRAY(final int index, final short dimensions) { - super(org.apache.bcel.Const.MULTIANEWARRAY, index); - if (dimensions < 1) { - throw new ClassGenException("Invalid dimensions value: " + dimensions); - } - this.dimensions = dimensions; - super.setLength(4); - } - - - /** - * Dump instruction as byte code to stream out. - * @param out Output stream - */ - @Override - public void dump( final DataOutputStream out ) throws IOException { - out.writeByte(super.getOpcode()); - out.writeShort(super.getIndex()); - out.writeByte(dimensions); - } - - - /** - * Read needed data (i.e., no. dimension) from file. - */ - @Override - protected void initFromFile( final ByteSequence bytes, final boolean wide ) throws IOException { - super.initFromFile(bytes, wide); - dimensions = bytes.readByte(); - super.setLength(4); - } - - - /** - * @return number of dimensions to be created - */ - public final short getDimensions() { - return dimensions; - } - - - /** - * @return mnemonic for instruction - */ - @Override - public String toString( final boolean verbose ) { - return super.toString(verbose) + " " + super.getIndex() + " " + dimensions; - } - - - /** - * @return mnemonic for instruction with symbolic references resolved - */ - @Override - public String toString( final ConstantPool cp ) { - return super.toString(cp) + " " + dimensions; - } - - - /** - * Also works for instructions whose stack effect depends on the - * constant pool entry they reference. - * @return Number of words consumed from stack by this instruction - */ - @Override - public int consumeStack( final ConstantPoolGen cpg ) { - return dimensions; - } - - - @Override - public Class[] getExceptions() { - return ExceptionConst.createExceptions(ExceptionConst.EXCS.EXCS_CLASS_AND_INTERFACE_RESOLUTION, - ExceptionConst.ILLEGAL_ACCESS_ERROR, - ExceptionConst.NEGATIVE_ARRAY_SIZE_EXCEPTION); - } - - - @Override - public ObjectType getLoadClassType( final ConstantPoolGen cpg ) { - Type t = getType(cpg); - if (t instanceof ArrayType) { - t = ((ArrayType) t).getBasicType(); - } - return (t instanceof ObjectType) ? (ObjectType) t : null; - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitLoadClass(this); - v.visitAllocationInstruction(this); - v.visitExceptionThrower(this); - v.visitTypedInstruction(this); - v.visitCPInstruction(this); - v.visitMULTIANEWARRAY(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/MethodGen.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/MethodGen.java deleted file mode 100644 index f7442419..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/MethodGen.java +++ /dev/null @@ -1,1315 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import java.util.ArrayList; -import java.util.Objects; -import java.util.List; -import java.util.Stack; -import java.util.Hashtable; -import java.util.Arrays; - -import org.apache.bcel.Const; -import org.apache.bcel.classfile.AnnotationEntry; -import org.apache.bcel.classfile.Annotations; -import org.apache.bcel.classfile.Attribute; -import org.apache.bcel.classfile.Code; -import org.apache.bcel.classfile.CodeException; -import org.apache.bcel.classfile.ExceptionTable; -import org.apache.bcel.classfile.LineNumber; -import org.apache.bcel.classfile.LineNumberTable; -import org.apache.bcel.classfile.LocalVariable; -import org.apache.bcel.classfile.LocalVariableTable; -import org.apache.bcel.classfile.LocalVariableTypeTable; -import org.apache.bcel.classfile.Method; -import org.apache.bcel.classfile.ParameterAnnotationEntry; -import org.apache.bcel.classfile.ParameterAnnotations; -import org.apache.bcel.classfile.RuntimeVisibleParameterAnnotations; -import org.apache.bcel.classfile.Utility; -import org.apache.bcel.util.BCELComparator; - -/** - * Template class for building up a method. This is done by defining exception - * handlers, adding thrown exceptions, local variables and attributes, whereas - * the `LocalVariableTable' and `LineNumberTable' attributes will be set - * automatically for the code. Use stripAttributes() if you don't like this. - * - * While generating code it may be necessary to insert NOP operations. You can - * use the `removeNOPs' method to get rid off them. - * The resulting method object can be obtained via the `getMethod()' method. - * - * @see InstructionList - * @see Method - */ -public class MethodGen extends FieldGenOrMethodGen { - - private String className; - private Type[] argTypes; - private String[] argNames; - private int maxLocals; - private int maxStack; - private InstructionList il; - private boolean stripAttributes; - private LocalVariableTypeTable localVariableTypeTable = null; - private final List variableList = new ArrayList<>(); - private final List lineNumberList = new ArrayList<>(); - private final List exceptionList = new ArrayList<>(); - private final List throwsList = new ArrayList<>(); - private final List codeAttrsList = new ArrayList<>(); - - private List[] paramAnnotations; // Array of lists containing AnnotationGen objects - private boolean hasParameterAnnotations = false; - private boolean haveUnpackedParameterAnnotations = false; - - private static BCELComparator bcelComparator = new BCELComparator() { - - @Override - public boolean equals( final Object o1, final Object o2 ) { - final MethodGen THIS = (MethodGen) o1; - final MethodGen THAT = (MethodGen) o2; - return Objects.equals(THIS.getName(), THAT.getName()) - && Objects.equals(THIS.getSignature(), THAT.getSignature()); - } - - - @Override - public int hashCode( final Object o ) { - final MethodGen THIS = (MethodGen) o; - return THIS.getSignature().hashCode() ^ THIS.getName().hashCode(); - } - }; - - - /** - * Declare method. If the method is non-static the constructor - * automatically declares a local variable `$this' in slot 0. The - * actual code is contained in the `il' parameter, which may further - * manipulated by the user. But he must take care not to remove any - * instruction (handles) that are still referenced from this object. - * - * For example one may not add a local variable and later remove the - * instructions it refers to without causing havoc. It is safe - * however if you remove that local variable, too. - * - * @param access_flags access qualifiers - * @param return_type method type - * @param argTypes argument types - * @param argNames argument names (if this is null, default names will be provided - * for them) - * @param method_name name of method - * @param className class name containing this method (may be null, if you don't care) - * @param il instruction list associated with this method, may be null only for - * abstract or native methods - * @param cp constant pool - */ - public MethodGen(final int access_flags, final Type return_type, final Type[] argTypes, String[] argNames, - final String method_name, final String className, final InstructionList il, final ConstantPoolGen cp) { - super(access_flags); - setType(return_type); - setArgumentTypes(argTypes); - setArgumentNames(argNames); - setName(method_name); - setClassName(className); - setInstructionList(il); - setConstantPool(cp); - final boolean abstract_ = isAbstract() || isNative(); - InstructionHandle start = null; - final InstructionHandle end = null; - if (!abstract_) { - start = il.getStart(); - // end == null => live to end of method - /* Add local variables, namely the implicit `this' and the arguments - */ - if (!isStatic() && (className != null)) { // Instance method -> `this' is local var 0 - addLocalVariable("this", ObjectType.getInstance(className), start, end); - } - } - if (argTypes != null) { - final int size = argTypes.length; - for (final Type arg_type : argTypes) { - if (Type.VOID == arg_type) { - throw new ClassGenException("'void' is an illegal argument type for a method"); - } - } - if (argNames != null) { // Names for variables provided? - if (size != argNames.length) { - throw new ClassGenException("Mismatch in argument array lengths: " + size - + " vs. " + argNames.length); - } - } else { // Give them dummy names - argNames = new String[size]; - for (int i = 0; i < size; i++) { - argNames[i] = "arg" + i; - } - setArgumentNames(argNames); - } - if (!abstract_) { - for (int i = 0; i < size; i++) { - addLocalVariable(argNames[i], argTypes[i], start, end); - } - } - } - } - - - /** - * Instantiate from existing method. - * - * @param method method - * @param className class name containing this method - * @param cp constant pool - */ - public MethodGen(final Method method, final String className, final ConstantPoolGen cp) { - this(method.getAccessFlags(), Type.getReturnType(method.getSignature()), - Type.getArgumentTypes(method.getSignature()), null /* may be overridden anyway */ - , method.getName(), className, - ((method.getAccessFlags() & (Const.ACC_ABSTRACT | Const.ACC_NATIVE)) == 0) - ? new InstructionList(getByteCodes(method)) - : null, - cp); - final Attribute[] attributes = method.getAttributes(); - for (final Attribute attribute : attributes) { - Attribute a = attribute; - if (a instanceof Code) { - final Code c = (Code) a; - setMaxStack(c.getMaxStack()); - setMaxLocals(c.getMaxLocals()); - final CodeException[] ces = c.getExceptionTable(); - if (ces != null) { - for (final CodeException ce : ces) { - final int type = ce.getCatchType(); - ObjectType c_type = null; - if (type > 0) { - final String cen = method.getConstantPool().getConstantString(type, Const.CONSTANT_Class); - c_type = ObjectType.getInstance(cen); - } - final int end_pc = ce.getEndPC(); - final int length = getByteCodes(method).length; - InstructionHandle end; - if (length == end_pc) { // May happen, because end_pc is exclusive - end = il.getEnd(); - } else { - end = il.findHandle(end_pc); - end = end.getPrev(); // Make it inclusive - } - addExceptionHandler(il.findHandle(ce.getStartPC()), end, il.findHandle(ce.getHandlerPC()), - c_type); - } - } - final Attribute[] c_attributes = c.getAttributes(); - for (final Attribute c_attribute : c_attributes) { - a = c_attribute; - if (a instanceof LineNumberTable) { - final LineNumber[] ln = ((LineNumberTable) a).getLineNumberTable(); - for (final LineNumber l : ln) { - final InstructionHandle ih = il.findHandle(l.getStartPC()); - if (ih != null) { - addLineNumber(ih, l.getLineNumber()); - } - } - } else if (a instanceof LocalVariableTable) { - updateLocalVariableTable((LocalVariableTable) a); - } else if (a instanceof LocalVariableTypeTable) { - this.localVariableTypeTable = (LocalVariableTypeTable) a.copy(cp.getConstantPool()); - } else { - addCodeAttribute(a); - } - } - } else if (a instanceof ExceptionTable) { - final String[] names = ((ExceptionTable) a).getExceptionNames(); - for (final String name2 : names) { - addException(name2); - } - } else if (a instanceof Annotations) { - final Annotations runtimeAnnotations = (Annotations) a; - final AnnotationEntry[] aes = runtimeAnnotations.getAnnotationEntries(); - for (final AnnotationEntry element : aes) { - addAnnotationEntry(new AnnotationEntryGen(element, cp, false)); - } - } else { - addAttribute(a); - } - } - } - - - private static byte[] getByteCodes(final Method method) { - final Code code = method.getCode(); - if (code == null) { - throw new IllegalStateException(String.format("The method '%s' has no code.", method)); - } - return code.getCode(); - } - - /** - * Adds a local variable to this method. - * - * @param name variable name - * @param type variable type - * @param slot the index of the local variable, if type is long or double, the next available - * index is slot+2 - * @param start from where the variable is valid - * @param end until where the variable is valid - * @param orig_index the index of the local variable prior to any modifications - * @return new local variable object - * @see LocalVariable - */ - public LocalVariableGen addLocalVariable( final String name, final Type type, final int slot, - final InstructionHandle start, final InstructionHandle end, final int orig_index ) { - final byte t = type.getType(); - if (t != Const.T_ADDRESS) { - final int add = type.getSize(); - if (slot + add > maxLocals) { - maxLocals = slot + add; - } - final LocalVariableGen l = new LocalVariableGen(slot, name, type, start, end, orig_index); - int i; - if ((i = variableList.indexOf(l)) >= 0) { - variableList.set(i, l); - } else { - variableList.add(l); - } - return l; - } - throw new IllegalArgumentException("Can not use " + type - + " as type for local variable"); - } - - - /** - * Adds a local variable to this method. - * - * @param name variable name - * @param type variable type - * @param slot the index of the local variable, if type is long or double, the next available - * index is slot+2 - * @param start from where the variable is valid - * @param end until where the variable is valid - * @return new local variable object - * @see LocalVariable - */ - public LocalVariableGen addLocalVariable( final String name, final Type type, final int slot, - final InstructionHandle start, final InstructionHandle end ) { - return addLocalVariable(name, type, slot, start, end, slot); - } - - /** - * Adds a local variable to this method and assigns an index automatically. - * - * @param name variable name - * @param type variable type - * @param start from where the variable is valid, if this is null, - * it is valid from the start - * @param end until where the variable is valid, if this is null, - * it is valid to the end - * @return new local variable object - * @see LocalVariable - */ - public LocalVariableGen addLocalVariable( final String name, final Type type, final InstructionHandle start, - final InstructionHandle end ) { - return addLocalVariable(name, type, maxLocals, start, end); - } - - - /** - * Remove a local variable, its slot will not be reused, if you do not use addLocalVariable - * with an explicit index argument. - */ - public void removeLocalVariable( final LocalVariableGen l ) { - l.dispose(); - variableList.remove(l); - } - - - /** - * Remove all local variables. - */ - public void removeLocalVariables() { - for (final LocalVariableGen lv : variableList) { - lv.dispose(); - } - variableList.clear(); - } - - - /* - * If the range of the variable has not been set yet, it will be set to be valid from - * the start to the end of the instruction list. - * - * @return array of declared local variables sorted by index - */ - public LocalVariableGen[] getLocalVariables() { - final int size = variableList.size(); - final LocalVariableGen[] lg = new LocalVariableGen[size]; - variableList.toArray(lg); - for (int i = 0; i < size; i++) { - if ((lg[i].getStart() == null) && (il != null)) { - lg[i].setStart(il.getStart()); - } - if ((lg[i].getEnd() == null) && (il != null)) { - lg[i].setEnd(il.getEnd()); - } - } - if (size > 1) { - Arrays.sort(lg, (o1, o2) -> o1.getIndex() - o2.getIndex()); - } - return lg; - } - - - /** - * @return `LocalVariableTable' attribute of all the local variables of this method. - */ - public LocalVariableTable getLocalVariableTable( final ConstantPoolGen cp ) { - final LocalVariableGen[] lg = getLocalVariables(); - final int size = lg.length; - final LocalVariable[] lv = new LocalVariable[size]; - for (int i = 0; i < size; i++) { - lv[i] = lg[i].getLocalVariable(cp); - } - return new LocalVariableTable(cp.addUtf8("LocalVariableTable"), 2 + lv.length * 10, lv, cp - .getConstantPool()); - } - - /** - * @return `LocalVariableTypeTable' attribute of this method. - */ - public LocalVariableTypeTable getLocalVariableTypeTable() { - return localVariableTypeTable; - } - - /** - * Give an instruction a line number corresponding to the source code line. - * - * @param ih instruction to tag - * @return new line number object - * @see LineNumber - */ - public LineNumberGen addLineNumber( final InstructionHandle ih, final int srcLine ) { - final LineNumberGen l = new LineNumberGen(ih, srcLine); - lineNumberList.add(l); - return l; - } - - - /** - * Remove a line number. - */ - public void removeLineNumber( final LineNumberGen l ) { - lineNumberList.remove(l); - } - - - /** - * Remove all line numbers. - */ - public void removeLineNumbers() { - lineNumberList.clear(); - } - - - /* - * @return array of line numbers - */ - public LineNumberGen[] getLineNumbers() { - final LineNumberGen[] lg = new LineNumberGen[lineNumberList.size()]; - lineNumberList.toArray(lg); - return lg; - } - - - /** - * @return `LineNumberTable' attribute of all the local variables of this method. - */ - public LineNumberTable getLineNumberTable( final ConstantPoolGen cp ) { - final int size = lineNumberList.size(); - final LineNumber[] ln = new LineNumber[size]; - for (int i = 0; i < size; i++) { - ln[i] = lineNumberList.get(i).getLineNumber(); - } - return new LineNumberTable(cp.addUtf8("LineNumberTable"), 2 + ln.length * 4, ln, cp - .getConstantPool()); - } - - - /** - * Add an exception handler, i.e., specify region where a handler is active and an - * instruction where the actual handling is done. - * - * @param start_pc Start of region (inclusive) - * @param end_pc End of region (inclusive) - * @param handler_pc Where handling is done - * @param catch_type class type of handled exception or null if any - * exception is handled - * @return new exception handler object - */ - public CodeExceptionGen addExceptionHandler( final InstructionHandle start_pc, - final InstructionHandle end_pc, final InstructionHandle handler_pc, final ObjectType catch_type ) { - if ((start_pc == null) || (end_pc == null) || (handler_pc == null)) { - throw new ClassGenException("Exception handler target is null instruction"); - } - final CodeExceptionGen c = new CodeExceptionGen(start_pc, end_pc, handler_pc, catch_type); - exceptionList.add(c); - return c; - } - - - /** - * Remove an exception handler. - */ - public void removeExceptionHandler( final CodeExceptionGen c ) { - exceptionList.remove(c); - } - - - /** - * Remove all line numbers. - */ - public void removeExceptionHandlers() { - exceptionList.clear(); - } - - - /* - * @return array of declared exception handlers - */ - public CodeExceptionGen[] getExceptionHandlers() { - final CodeExceptionGen[] cg = new CodeExceptionGen[exceptionList.size()]; - exceptionList.toArray(cg); - return cg; - } - - - /** - * @return code exceptions for `Code' attribute - */ - private CodeException[] getCodeExceptions() { - final int size = exceptionList.size(); - final CodeException[] c_exc = new CodeException[size]; - for (int i = 0; i < size; i++) { - final CodeExceptionGen c = exceptionList.get(i); - c_exc[i] = c.getCodeException(super.getConstantPool()); - } - return c_exc; - } - - - /** - * Add an exception possibly thrown by this method. - * - * @param className (fully qualified) name of exception - */ - public void addException( final String className ) { - throwsList.add(className); - } - - - /** - * Remove an exception. - */ - public void removeException( final String c ) { - throwsList.remove(c); - } - - - /** - * Remove all exceptions. - */ - public void removeExceptions() { - throwsList.clear(); - } - - - /* - * @return array of thrown exceptions - */ - public String[] getExceptions() { - final String[] e = new String[throwsList.size()]; - throwsList.toArray(e); - return e; - } - - - /** - * @return `Exceptions' attribute of all the exceptions thrown by this method. - */ - private ExceptionTable getExceptionTable( final ConstantPoolGen cp ) { - final int size = throwsList.size(); - final int[] ex = new int[size]; - for (int i = 0; i < size; i++) { - ex[i] = cp.addClass(throwsList.get(i)); - } - return new ExceptionTable(cp.addUtf8("Exceptions"), 2 + 2 * size, ex, cp.getConstantPool()); - } - - - /** - * Add an attribute to the code. Currently, the JVM knows about the - * LineNumberTable, LocalVariableTable and StackMap attributes, - * where the former two will be generated automatically and the - * latter is used for the MIDP only. Other attributes will be - * ignored by the JVM but do no harm. - * - * @param a attribute to be added - */ - public void addCodeAttribute( final Attribute a ) { - codeAttrsList.add(a); - } - - - /** - * Remove the LocalVariableTypeTable - */ - public void removeLocalVariableTypeTable( ) { - localVariableTypeTable = null; - } - - /** - * Remove a code attribute. - */ - public void removeCodeAttribute( final Attribute a ) { - codeAttrsList.remove(a); - } - - - /** - * Remove all code attributes. - */ - public void removeCodeAttributes() { - localVariableTypeTable = null; - codeAttrsList.clear(); - } - - - /** - * @return all attributes of this method. - */ - public Attribute[] getCodeAttributes() { - final Attribute[] attributes = new Attribute[codeAttrsList.size()]; - codeAttrsList.toArray(attributes); - return attributes; - } - - /** - * @since 6.0 - */ - public void addAnnotationsAsAttribute(final ConstantPoolGen cp) { - final Attribute[] attrs = AnnotationEntryGen.getAnnotationAttributes(cp, super.getAnnotationEntries()); - for (final Attribute attr : attrs) { - addAttribute(attr); - } - } - - /** - * @since 6.0 - */ - public void addParameterAnnotationsAsAttribute(final ConstantPoolGen cp) { - if (!hasParameterAnnotations) { - return; - } - final Attribute[] attrs = AnnotationEntryGen.getParameterAnnotationAttributes(cp, paramAnnotations); - if (attrs != null) { - for (final Attribute attr : attrs) { - addAttribute(attr); - } - } - } - - private Attribute[] addRuntimeAnnotationsAsAttribute(final ConstantPoolGen cp) { - final Attribute[] attrs = AnnotationEntryGen.getAnnotationAttributes(cp, super.getAnnotationEntries()); - for (final Attribute attr : attrs) { - addAttribute(attr); - } - return attrs; - } - - private Attribute[] addRuntimeParameterAnnotationsAsAttribute(final ConstantPoolGen cp) { - if (!hasParameterAnnotations) { - return new Attribute[0]; - } - final Attribute[] attrs = AnnotationEntryGen.getParameterAnnotationAttributes(cp, paramAnnotations); - for (final Attribute attr : attrs) { - addAttribute(attr); - } - return attrs; - } - - /** - * Would prefer to make this private, but need a way to test if client is - * using BCEL version 6.5.0 or later that contains fix for BCEL-329. - * @since 6.5.0 - */ - public void removeRuntimeAttributes(final Attribute[] attrs) { - for (final Attribute attr : attrs) { - removeAttribute(attr); - } - } - - - /** - * Get method object. Never forget to call setMaxStack() or setMaxStack(max), respectively, - * before calling this method (the same applies for max locals). - * - * @return method object - */ - public Method getMethod() { - final String signature = getSignature(); - final ConstantPoolGen _cp = super.getConstantPool(); - final int name_index = _cp.addUtf8(super.getName()); - final int signature_index = _cp.addUtf8(signature); - /* Also updates positions of instructions, i.e., their indices - */ - byte[] byte_code = null; - if (il != null) { - byte_code = il.getByteCode(); - } - LineNumberTable lnt = null; - LocalVariableTable lvt = null; - /* Create LocalVariableTable and LineNumberTable attributes (for debuggers, e.g.) - */ - if ((variableList.size() > 0) && !stripAttributes) { - updateLocalVariableTable(getLocalVariableTable(_cp)); - addCodeAttribute(lvt = getLocalVariableTable(_cp)); - } - if (localVariableTypeTable != null) { - // LocalVariable length in LocalVariableTypeTable is not updated automatically. It's a difference with LocalVariableTable. - if (lvt != null) { - adjustLocalVariableTypeTable(lvt); - } - addCodeAttribute(localVariableTypeTable); - } - if ((lineNumberList.size() > 0) && !stripAttributes) { - addCodeAttribute(lnt = getLineNumberTable(_cp)); - } - final Attribute[] code_attrs = getCodeAttributes(); - /* Each attribute causes 6 additional header bytes - */ - int attrs_len = 0; - for (final Attribute code_attr : code_attrs) { - attrs_len += code_attr.getLength() + 6; - } - final CodeException[] c_exc = getCodeExceptions(); - final int exc_len = c_exc.length * 8; // Every entry takes 8 bytes - Code code = null; - if ((il != null) && !isAbstract() && !isNative()) { - // Remove any stale code attribute - final Attribute[] attributes = getAttributes(); - for (final Attribute a : attributes) { - if (a instanceof Code) { - removeAttribute(a); - } - } - code = new Code(_cp.addUtf8("Code"), 8 + byte_code.length + // prologue byte code - 2 + exc_len + // exceptions - 2 + attrs_len, // attributes - maxStack, maxLocals, byte_code, c_exc, code_attrs, _cp.getConstantPool()); - addAttribute(code); - } - final Attribute[] annotations = addRuntimeAnnotationsAsAttribute(_cp); - final Attribute[] parameterAnnotations = addRuntimeParameterAnnotationsAsAttribute(_cp); - ExceptionTable et = null; - if (throwsList.size() > 0) { - addAttribute(et = getExceptionTable(_cp)); - // Add `Exceptions' if there are "throws" clauses - } - final Method m = new Method(super.getAccessFlags(), name_index, signature_index, getAttributes(), _cp - .getConstantPool()); - // Undo effects of adding attributes - if (lvt != null) { - removeCodeAttribute(lvt); - } - if (localVariableTypeTable != null) { - removeCodeAttribute(localVariableTypeTable); - } - if (lnt != null) { - removeCodeAttribute(lnt); - } - if (code != null) { - removeAttribute(code); - } - if (et != null) { - removeAttribute(et); - } - removeRuntimeAttributes(annotations); - removeRuntimeAttributes(parameterAnnotations); - return m; - } - - private void updateLocalVariableTable(final LocalVariableTable a) { - final LocalVariable[] lv = a.getLocalVariableTable(); - removeLocalVariables(); - for (final LocalVariable l : lv) { - InstructionHandle start = il.findHandle(l.getStartPC()); - final InstructionHandle end = il.findHandle(l.getStartPC() + l.getLength()); - // Repair malformed handles - if (null == start) { - start = il.getStart(); - } - // end == null => live to end of method - // Since we are recreating the LocalVaraible, we must - // propagate the orig_index to new copy. - addLocalVariable(l.getName(), Type.getType(l.getSignature()), l - .getIndex(), start, end, l.getOrigIndex()); - } - } - - private void adjustLocalVariableTypeTable(final LocalVariableTable lvt) { - final LocalVariable[] lv = lvt.getLocalVariableTable(); - final LocalVariable[] lvg = localVariableTypeTable.getLocalVariableTypeTable(); - - for (final LocalVariable element : lvg) { - for (final LocalVariable l : lv) { - if (element.getName().equals(l.getName()) && element.getIndex() == l.getOrigIndex()) { - element.setLength(l.getLength()); - element.setStartPC(l.getStartPC()); - element.setIndex(l.getIndex()); - break; - } - } - } - } - - - /** - * Remove all NOPs from the instruction list (if possible) and update every - * object referring to them, i.e., branch instructions, local variables and - * exception handlers. - */ - public void removeNOPs() { - if (il != null) { - InstructionHandle next; - /* Check branch instructions. - */ - for (InstructionHandle ih = il.getStart(); ih != null; ih = next) { - next = ih.getNext(); - if ((next != null) && (ih.getInstruction() instanceof NOP)) { - try { - il.delete(ih); - } catch (final TargetLostException e) { - for (final InstructionHandle target : e.getTargets()) { - for (final InstructionTargeter targeter : target.getTargeters()) { - targeter.updateTarget(target, next); - } - } - } - } - } - } - } - - - /** - * Set maximum number of local variables. - */ - public void setMaxLocals( final int m ) { - maxLocals = m; - } - - - public int getMaxLocals() { - return maxLocals; - } - - - /** - * Set maximum stack size for this method. - */ - public void setMaxStack( final int m ) { // TODO could be package-protected? - maxStack = m; - } - - - public int getMaxStack() { - return maxStack; - } - - - /** @return class that contains this method - */ - public String getClassName() { - return className; - } - - - public void setClassName( final String class_name ) { // TODO could be package-protected? - this.className = class_name; - } - - - public void setReturnType( final Type return_type ) { - setType(return_type); - } - - - public Type getReturnType() { - return getType(); - } - - - public void setArgumentTypes( final Type[] arg_types ) { - this.argTypes = arg_types; - } - - - public Type[] getArgumentTypes() { - return argTypes.clone(); - } - - - public void setArgumentType( final int i, final Type type ) { - argTypes[i] = type; - } - - - public Type getArgumentType( final int i ) { - return argTypes[i]; - } - - - public void setArgumentNames( final String[] arg_names ) { - this.argNames = arg_names; - } - - - public String[] getArgumentNames() { - return argNames.clone(); - } - - - public void setArgumentName( final int i, final String name ) { - argNames[i] = name; - } - - - public String getArgumentName( final int i ) { - return argNames[i]; - } - - - public InstructionList getInstructionList() { - return il; - } - - - public void setInstructionList( final InstructionList il ) { // TODO could be package-protected? - this.il = il; - } - - - @Override - public String getSignature() { - return Type.getMethodSignature(super.getType(), argTypes); - } - - - /** - * Computes max. stack size by performing control flow analysis. - */ - public void setMaxStack() { // TODO could be package-protected? (some tests would need repackaging) - if (il != null) { - maxStack = getMaxStack(super.getConstantPool(), il, getExceptionHandlers()); - } else { - maxStack = 0; - } - } - - - /** - * Compute maximum number of local variables. - */ - public void setMaxLocals() { // TODO could be package-protected? (some tests would need repackaging) - if (il != null) { - int max = isStatic() ? 0 : 1; - if (argTypes != null) { - for (final Type arg_type : argTypes) { - max += arg_type.getSize(); - } - } - for (InstructionHandle ih = il.getStart(); ih != null; ih = ih.getNext()) { - final Instruction ins = ih.getInstruction(); - if ((ins instanceof LocalVariableInstruction) || (ins instanceof RET) - || (ins instanceof IINC)) { - final int index = ((IndexedInstruction) ins).getIndex() - + ((TypedInstruction) ins).getType(super.getConstantPool()).getSize(); - if (index > max) { - max = index; - } - } - } - maxLocals = max; - } else { - maxLocals = 0; - } - } - - - /** Do not/Do produce attributes code attributesLineNumberTable and - * LocalVariableTable, like javac -O - */ - public void stripAttributes( final boolean flag ) { - stripAttributes = flag; - } - - static final class BranchTarget { - - final InstructionHandle target; - final int stackDepth; - - - BranchTarget(final InstructionHandle target, final int stackDepth) { - this.target = target; - this.stackDepth = stackDepth; - } - } - - static final class BranchStack { - - private final Stack branchTargets = new Stack<>(); - private final Hashtable visitedTargets = new Hashtable<>(); - - - public void push( final InstructionHandle target, final int stackDepth ) { - if (visited(target)) { - return; - } - branchTargets.push(visit(target, stackDepth)); - } - - - public BranchTarget pop() { - if (!branchTargets.empty()) { - final BranchTarget bt = branchTargets.pop(); - return bt; - } - return null; - } - - - private BranchTarget visit( final InstructionHandle target, final int stackDepth ) { - final BranchTarget bt = new BranchTarget(target, stackDepth); - visitedTargets.put(target, bt); - return bt; - } - - - private boolean visited( final InstructionHandle target ) { - return visitedTargets.get(target) != null; - } - } - - - /** - * Computes stack usage of an instruction list by performing control flow analysis. - * - * @return maximum stack depth used by method - */ - public static int getMaxStack( final ConstantPoolGen cp, final InstructionList il, final CodeExceptionGen[] et ) { - final BranchStack branchTargets = new BranchStack(); - /* Initially, populate the branch stack with the exception - * handlers, because these aren't (necessarily) branched to - * explicitly. in each case, the stack will have depth 1, - * containing the exception object. - */ - for (final CodeExceptionGen element : et) { - final InstructionHandle handler_pc = element.getHandlerPC(); - if (handler_pc != null) { - branchTargets.push(handler_pc, 1); - } - } - int stackDepth = 0; - int maxStackDepth = 0; - InstructionHandle ih = il.getStart(); - while (ih != null) { - final Instruction instruction = ih.getInstruction(); - final short opcode = instruction.getOpcode(); - final int delta = instruction.produceStack(cp) - instruction.consumeStack(cp); - stackDepth += delta; - if (stackDepth > maxStackDepth) { - maxStackDepth = stackDepth; - } - // choose the next instruction based on whether current is a branch. - if (instruction instanceof BranchInstruction) { - final BranchInstruction branch = (BranchInstruction) instruction; - if (instruction instanceof Select) { - // explore all of the select's targets. the default target is handled below. - final Select select = (Select) branch; - final InstructionHandle[] targets = select.getTargets(); - for (final InstructionHandle target : targets) { - branchTargets.push(target, stackDepth); - } - // nothing to fall through to. - ih = null; - } else if (!(branch instanceof IfInstruction)) { - // if an instruction that comes back to following PC, - // push next instruction, with stack depth reduced by 1. - if (opcode == Const.JSR || opcode == Const.JSR_W) { - branchTargets.push(ih.getNext(), stackDepth - 1); - } - ih = null; - } - // for all branches, the target of the branch is pushed on the branch stack. - // conditional branches have a fall through case, selects don't, and - // jsr/jsr_w return to the next instruction. - branchTargets.push(branch.getTarget(), stackDepth); - } else { - // check for instructions that terminate the method. - if (opcode == Const.ATHROW || opcode == Const.RET - || (opcode >= Const.IRETURN && opcode <= Const.RETURN)) { - ih = null; - } - } - // normal case, go to the next instruction. - if (ih != null) { - ih = ih.getNext(); - } - // if we have no more instructions, see if there are any deferred branches to explore. - if (ih == null) { - final BranchTarget bt = branchTargets.pop(); - if (bt != null) { - ih = bt.target; - stackDepth = bt.stackDepth; - } - } - } - return maxStackDepth; - } - - private List observers; - - - /** Add observer for this object. - */ - public void addObserver( final MethodObserver o ) { - if (observers == null) { - observers = new ArrayList<>(); - } - observers.add(o); - } - - - /** Remove observer for this object. - */ - public void removeObserver( final MethodObserver o ) { - if (observers != null) { - observers.remove(o); - } - } - - - /** Call notify() method on all observers. This method is not called - * automatically whenever the state has changed, but has to be - * called by the user after he has finished editing the object. - */ - public void update() { - if (observers != null) { - for (final MethodObserver observer : observers) { - observer.notify(this); - } - } - } - - - /** - * Return string representation close to declaration format, - * `public static void main(String[]) throws IOException', e.g. - * - * @return String representation of the method. - */ - @Override - public final String toString() { - final String access = Utility.accessToString(super.getAccessFlags()); - String signature = Type.getMethodSignature(super.getType(), argTypes); - signature = Utility.methodSignatureToString(signature, super.getName(), access, true, - getLocalVariableTable(super.getConstantPool())); - final StringBuilder buf = new StringBuilder(signature); - for (final Attribute a : getAttributes()) { - if (!((a instanceof Code) || (a instanceof ExceptionTable))) { - buf.append(" [").append(a).append("]"); - } - } - - if (throwsList.size() > 0) { - for (final String throwsDescriptor : throwsList) { - buf.append("\n\t\tthrows ").append(throwsDescriptor); - } - } - return buf.toString(); - } - - - /** @return deep copy of this method - */ - public MethodGen copy( final String className, final ConstantPoolGen cp ) { - final Method m = ((MethodGen) clone()).getMethod(); - final MethodGen mg = new MethodGen(m, className, super.getConstantPool()); - if (super.getConstantPool() != cp) { - mg.setConstantPool(cp); - mg.getInstructionList().replaceConstantPool(super.getConstantPool(), cp); - } - return mg; - } - - //J5TODO: Should paramAnnotations be an array of arrays? Rather than an array of lists, this - // is more likely to suggest to the caller it is readonly (which a List does not). - /** - * Return a list of AnnotationGen objects representing parameter annotations - * @since 6.0 - */ - public List getAnnotationsOnParameter(final int i) { - ensureExistingParameterAnnotationsUnpacked(); - if (!hasParameterAnnotations || i>argTypes.length) { - return null; - } - return paramAnnotations[i]; - } - - /** - * Goes through the attributes on the method and identifies any that are - * RuntimeParameterAnnotations, extracting their contents and storing them - * as parameter annotations. There are two kinds of parameter annotation - - * visible and invisible. Once they have been unpacked, these attributes are - * deleted. (The annotations will be rebuilt as attributes when someone - * builds a Method object out of this MethodGen object). - */ - private void ensureExistingParameterAnnotationsUnpacked() - { - if (haveUnpackedParameterAnnotations) { - return; - } - // Find attributes that contain parameter annotation data - final Attribute[] attrs = getAttributes(); - ParameterAnnotations paramAnnVisAttr = null; - ParameterAnnotations paramAnnInvisAttr = null; - for (final Attribute attribute : attrs) { - if (attribute instanceof ParameterAnnotations) - { - // Initialize paramAnnotations - if (!hasParameterAnnotations) - { - @SuppressWarnings("unchecked") // OK - final List[] parmList = new List[argTypes.length]; - paramAnnotations = parmList; - for (int j = 0; j < argTypes.length; j++) { - paramAnnotations[j] = new ArrayList<>(); - } - } - hasParameterAnnotations = true; - final ParameterAnnotations rpa = (ParameterAnnotations) attribute; - if (rpa instanceof RuntimeVisibleParameterAnnotations) { - paramAnnVisAttr = rpa; - } else { - paramAnnInvisAttr = rpa; - } - final ParameterAnnotationEntry[] parameterAnnotationEntries = rpa.getParameterAnnotationEntries(); - for (int j = 0; j < parameterAnnotationEntries.length; j++) - { - // This returns Annotation[] ... - final ParameterAnnotationEntry immutableArray = rpa.getParameterAnnotationEntries()[j]; - // ... which needs transforming into an AnnotationGen[] ... - final List mutable = makeMutableVersion(immutableArray.getAnnotationEntries()); - // ... then add these to any we already know about - paramAnnotations[j].addAll(mutable); - } - } - } - if (paramAnnVisAttr != null) { - removeAttribute(paramAnnVisAttr); - } - if (paramAnnInvisAttr != null) { - removeAttribute(paramAnnInvisAttr); - } - haveUnpackedParameterAnnotations = true; - } - - private List makeMutableVersion(final AnnotationEntry[] mutableArray) - { - final List result = new ArrayList<>(); - for (final AnnotationEntry element : mutableArray) { - result.add(new AnnotationEntryGen(element, getConstantPool(), - false)); - } - return result; - } - - public void addParameterAnnotation(final int parameterIndex, - final AnnotationEntryGen annotation) - { - ensureExistingParameterAnnotationsUnpacked(); - if (!hasParameterAnnotations) - { - @SuppressWarnings("unchecked") // OK - final List[] parmList = new List[argTypes.length]; - paramAnnotations = parmList; - hasParameterAnnotations = true; - } - final List existingAnnotations = paramAnnotations[parameterIndex]; - if (existingAnnotations != null) - { - existingAnnotations.add(annotation); - } - else - { - final List l = new ArrayList<>(); - l.add(annotation); - paramAnnotations[parameterIndex] = l; - } - } - - - - - /** - * @return Comparison strategy object - */ - public static BCELComparator getComparator() { - return bcelComparator; - } - - - /** - * @param comparator Comparison strategy object - */ - public static void setComparator( final BCELComparator comparator ) { - bcelComparator = comparator; - } - - - /** - * Return value as defined by given BCELComparator strategy. - * By default two MethodGen objects are said to be equal when - * their names and signatures are equal. - * - * @see java.lang.Object#equals(java.lang.Object) - */ - @Override - public boolean equals( final Object obj ) { - return bcelComparator.equals(this, obj); - } - - - /** - * Return value as defined by given BCELComparator strategy. - * By default return the hashcode of the method's name XOR signature. - * - * @see java.lang.Object#hashCode() - */ - @Override - public int hashCode() { - return bcelComparator.hashCode(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/MethodObserver.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/MethodObserver.java deleted file mode 100644 index 3cf7b2b9..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/MethodObserver.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * Implement this interface if you're interested in changes to a MethodGen object - * and register yourself with addObserver(). - * - */ -public interface MethodObserver { - - void notify( MethodGen method ); -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/NEW.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/NEW.java deleted file mode 100644 index 759c09a2..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/NEW.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import org.apache.bcel.ExceptionConst; - -/** - * NEW - Create new object - * 
Stack: ... -> ..., objectref
- * - */ -public class NEW extends CPInstruction implements LoadClass, AllocationInstruction, - ExceptionThrower, StackProducer { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - NEW() { - } - - - public NEW(final int index) { - super(org.apache.bcel.Const.NEW, index); - } - - - @Override - public Class[] getExceptions() { - return ExceptionConst.createExceptions(ExceptionConst.EXCS.EXCS_CLASS_AND_INTERFACE_RESOLUTION, - ExceptionConst.ILLEGAL_ACCESS_ERROR, - ExceptionConst.INSTANTIATION_ERROR); - } - - - @Override - public ObjectType getLoadClassType( final ConstantPoolGen cpg ) { - return (ObjectType) getType(cpg); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitLoadClass(this); - v.visitAllocationInstruction(this); - v.visitExceptionThrower(this); - v.visitStackProducer(this); - v.visitTypedInstruction(this); - v.visitCPInstruction(this); - v.visitNEW(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/NEWARRAY.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/NEWARRAY.java deleted file mode 100644 index 280dda22..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/NEWARRAY.java +++ /dev/null @@ -1,126 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.ExceptionConst; -import org.apache.bcel.util.ByteSequence; - -/** - * NEWARRAY - Create new array of basic type (int, short, ...) - * 
Stack: ..., count -> ..., arrayref
- * type must be one of T_INT, T_SHORT, ... - * - */ -public class NEWARRAY extends Instruction implements AllocationInstruction, ExceptionThrower, - StackProducer { - - private byte type; - - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - NEWARRAY() { - } - - - public NEWARRAY(final byte type) { - super(org.apache.bcel.Const.NEWARRAY, (short) 2); - this.type = type; - } - - - public NEWARRAY(final BasicType type) { - this(type.getType()); - } - - - /** - * Dump instruction as byte code to stream out. - * @param out Output stream - */ - @Override - public void dump( final DataOutputStream out ) throws IOException { - out.writeByte(super.getOpcode()); - out.writeByte(type); - } - - - /** - * @return numeric code for basic element type - */ - public final byte getTypecode() { - return type; - } - - - /** - * @return type of constructed array - */ - public final Type getType() { - return new ArrayType(BasicType.getType(type), 1); - } - - - /** - * @return mnemonic for instruction - */ - @Override - public String toString( final boolean verbose ) { - return super.toString(verbose) + " " + org.apache.bcel.Const.getTypeName(type); - } - - - /** - * Read needed data (e.g. index) from file. - */ - @Override - protected void initFromFile( final ByteSequence bytes, final boolean wide ) throws IOException { - type = bytes.readByte(); - super.setLength(2); - } - - - @Override - public Class[] getExceptions() { - return new Class[] { - ExceptionConst.NEGATIVE_ARRAY_SIZE_EXCEPTION - }; - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitAllocationInstruction(this); - v.visitExceptionThrower(this); - v.visitStackProducer(this); - v.visitNEWARRAY(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/NOP.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/NOP.java deleted file mode 100644 index 5f254b95..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/NOP.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * NOP - Do nothing - * - */ -public class NOP extends Instruction { - - public NOP() { - super(org.apache.bcel.Const.NOP, (short) 1); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitNOP(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/NameSignatureInstruction.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/NameSignatureInstruction.java deleted file mode 100644 index e1540172..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/NameSignatureInstruction.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.bcel.generic; - -import org.apache.bcel.classfile.ConstantCP; -import org.apache.bcel.classfile.ConstantNameAndType; -import org.apache.bcel.classfile.ConstantPool; -import org.apache.bcel.classfile.ConstantUtf8; - -/** - * Super class for FieldOrMethod and INVOKEDYNAMIC, since they both have - * names and signatures - * - * @since 6.0 - */ -public abstract class NameSignatureInstruction extends CPInstruction { - - public NameSignatureInstruction() { - super(); - } - - public NameSignatureInstruction(final short opcode, final int index) { - super(opcode, index); - } - - public ConstantNameAndType getNameAndType(final ConstantPoolGen cpg) { - final ConstantPool cp = cpg.getConstantPool(); - final ConstantCP cmr = (ConstantCP) cp.getConstant(super.getIndex()); - return (ConstantNameAndType) cp.getConstant(cmr.getNameAndTypeIndex()); - } - /** @return signature of referenced method/field. - */ - public String getSignature(final ConstantPoolGen cpg) { - final ConstantPool cp = cpg.getConstantPool(); - final ConstantNameAndType cnat = getNameAndType(cpg); - return ((ConstantUtf8) cp.getConstant(cnat.getSignatureIndex())).getBytes(); - } - - /** @return name of referenced method/field. - */ - public String getName(final ConstantPoolGen cpg) { - final ConstantPool cp = cpg.getConstantPool(); - final ConstantNameAndType cnat = getNameAndType(cpg); - return ((ConstantUtf8) cp.getConstant(cnat.getNameIndex())).getBytes(); - } - -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/NamedAndTyped.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/NamedAndTyped.java deleted file mode 100644 index 40ce4fbe..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/NamedAndTyped.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * Denote entity that has both name and type. This is true for local variables, - * methods and fields. - * - */ -public interface NamedAndTyped { - - String getName(); - - - Type getType(); - - - void setName( String name ); - - - void setType( Type type ); -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ObjectType.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ObjectType.java deleted file mode 100644 index a92ff413..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ObjectType.java +++ /dev/null @@ -1,163 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import org.apache.bcel.Const; -import org.apache.bcel.Repository; -import org.apache.bcel.classfile.JavaClass; - -/** - * Denotes reference such as java.lang.String. - * - */ -public class ObjectType extends ReferenceType { - - private final String className; // Class name of type - - /** - * @since 6.0 - */ - public static ObjectType getInstance(final String className) { - return new ObjectType(className); - } - - /** - * @param className fully qualified class name, e.g. java.lang.String - */ - public ObjectType(final String className) { - super(Const.T_REFERENCE, "L" + className.replace('.', '/') + ";"); - this.className = className.replace('/', '.'); - } - - - /** @return name of referenced class - */ - public String getClassName() { - return className; - } - - - /** @return a hash code value for the object. - */ - @Override - public int hashCode() { - return className.hashCode(); - } - - - /** @return true if both type objects refer to the same class. - */ - @Override - public boolean equals( final Object type ) { - return (type instanceof ObjectType) - ? ((ObjectType) type).className.equals(className) - : false; - } - - - /** - * If "this" doesn't reference a class, it references an interface - * or a non-existant entity. - * @deprecated (since 6.0) this method returns an inaccurate result - * if the class or interface referenced cannot - * be found: use referencesClassExact() instead - */ - @Deprecated - public boolean referencesClass() { - try { - final JavaClass jc = Repository.lookupClass(className); - return jc.isClass(); - } catch (final ClassNotFoundException e) { - return false; - } - } - - - /** - * If "this" doesn't reference an interface, it references a class - * or a non-existant entity. - * @deprecated (since 6.0) this method returns an inaccurate result - * if the class or interface referenced cannot - * be found: use referencesInterfaceExact() instead - */ - @Deprecated - public boolean referencesInterface() { - try { - final JavaClass jc = Repository.lookupClass(className); - return !jc.isClass(); - } catch (final ClassNotFoundException e) { - return false; - } - } - - - /** - * Return true if this type references a class, - * false if it references an interface. - * @return true if the type references a class, false if - * it references an interface - * @throws ClassNotFoundException if the class or interface - * referenced by this type can't be found - */ - public boolean referencesClassExact() throws ClassNotFoundException { - final JavaClass jc = Repository.lookupClass(className); - return jc.isClass(); - } - - - /** - * Return true if this type references an interface, - * false if it references a class. - * @return true if the type references an interface, false if - * it references a class - * @throws ClassNotFoundException if the class or interface - * referenced by this type can't be found - */ - public boolean referencesInterfaceExact() throws ClassNotFoundException { - final JavaClass jc = Repository.lookupClass(className); - return !jc.isClass(); - } - - - /** - * Return true if this type is a subclass of given ObjectType. - * @throws ClassNotFoundException if any of this class's superclasses - * can't be found - */ - public boolean subclassOf( final ObjectType superclass ) throws ClassNotFoundException { - if (this.referencesInterfaceExact() || superclass.referencesInterfaceExact()) { - return false; - } - return Repository.instanceOf(this.className, superclass.className); - } - - - /** - * Java Virtual Machine Specification edition 2, � 5.4.4 Access Control - * @throws ClassNotFoundException if the class referenced by this type - * can't be found - */ - public boolean accessibleTo( final ObjectType accessor ) throws ClassNotFoundException { - final JavaClass jc = Repository.lookupClass(className); - if (jc.isPublic()) { - return true; - } - final JavaClass acc = Repository.lookupClass(accessor.className); - return acc.getPackageName().equals(jc.getPackageName()); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/POP.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/POP.java deleted file mode 100644 index 08d942a6..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/POP.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * POP - Pop top operand stack word - * - * 
Stack: ..., word -> ...
- * - */ -public class POP extends StackInstruction implements PopInstruction { - - public POP() { - super(org.apache.bcel.Const.POP); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackConsumer(this); - v.visitPopInstruction(this); - v.visitStackInstruction(this); - v.visitPOP(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/POP2.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/POP2.java deleted file mode 100644 index 1e8eb48e..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/POP2.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * POP2 - Pop two top operand stack words - * - * 
Stack: ..., word2, word1 -> ...
- * - */ -public class POP2 extends StackInstruction implements PopInstruction { - - public POP2() { - super(org.apache.bcel.Const.POP2); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackConsumer(this); - v.visitPopInstruction(this); - v.visitStackInstruction(this); - v.visitPOP2(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/PUSH.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/PUSH.java deleted file mode 100644 index f652da9e..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/PUSH.java +++ /dev/null @@ -1,191 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import org.apache.bcel.Const; - -/** - * Wrapper class for push operations, which are implemented either as BIPUSH, - * LDC or xCONST_n instructions. - * - */ -public final class PUSH implements CompoundInstruction, VariableLengthInstruction, InstructionConstants { - - private Instruction instruction; - - - /** - * This constructor also applies for values of type short, char, byte - * - * @param cp Constant pool - * @param value to be pushed - */ - public PUSH(final ConstantPoolGen cp, final int value) { - if ((value >= -1) && (value <= 5)) { - instruction = InstructionConst.getInstruction(Const.ICONST_0 + value); - } else if (Instruction.isValidByte(value)) { - instruction = new BIPUSH((byte) value); - } else if (Instruction.isValidShort(value)) { - instruction = new SIPUSH((short) value); - } else { - instruction = new LDC(cp.addInteger(value)); - } - } - - - /** - * @param cp Constant pool - * @param value to be pushed - */ - public PUSH(final ConstantPoolGen cp, final boolean value) { - instruction = InstructionConst.getInstruction(Const.ICONST_0 + (value ? 1 : 0)); - } - - - /** - * @param cp Constant pool - * @param value to be pushed - */ - public PUSH(final ConstantPoolGen cp, final float value) { - if (value == 0.0) { - instruction = InstructionConst.FCONST_0; - } else if (value == 1.0) { - instruction = InstructionConst.FCONST_1; - } else if (value == 2.0) { - instruction = InstructionConst.FCONST_2; - } else { - instruction = new LDC(cp.addFloat(value)); - } - } - - - /** - * @param cp Constant pool - * @param value to be pushed - */ - public PUSH(final ConstantPoolGen cp, final long value) { - if (value == 0) { - instruction = InstructionConst.LCONST_0; - } else if (value == 1) { - instruction = InstructionConst.LCONST_1; - } else { - instruction = new LDC2_W(cp.addLong(value)); - } - } - - - /** - * @param cp Constant pool - * @param value to be pushed - */ - public PUSH(final ConstantPoolGen cp, final double value) { - if (value == 0.0) { - instruction = InstructionConst.DCONST_0; - } else if (value == 1.0) { - instruction = InstructionConst.DCONST_1; - } else { - instruction = new LDC2_W(cp.addDouble(value)); - } - } - - - /** - * @param cp Constant pool - * @param value to be pushed - */ - public PUSH(final ConstantPoolGen cp, final String value) { - if (value == null) { - instruction = InstructionConst.ACONST_NULL; - } else { - instruction = new LDC(cp.addString(value)); - } - } - - /** - * - * @param cp - * @param value - * @since 6.0 - */ - public PUSH(final ConstantPoolGen cp, final ObjectType value) { - if (value == null) { - instruction = InstructionConst.ACONST_NULL; - } else { - instruction = new LDC(cp.addClass(value)); - } - } - - /** - * @param cp Constant pool - * @param value to be pushed - */ - public PUSH(final ConstantPoolGen cp, final Number value) { - if ((value instanceof Integer) || (value instanceof Short) || (value instanceof Byte)) { - instruction = new PUSH(cp, value.intValue()).instruction; - } else if (value instanceof Double) { - instruction = new PUSH(cp, value.doubleValue()).instruction; - } else if (value instanceof Float) { - instruction = new PUSH(cp, value.floatValue()).instruction; - } else if (value instanceof Long) { - instruction = new PUSH(cp, value.longValue()).instruction; - } else { - throw new ClassGenException("What's this: " + value); - } - } - - - /** - * creates a push object from a Character value. Warning: Make sure not to attempt to allow - * autoboxing to create this value parameter, as an alternative constructor will be called - * - * @param cp Constant pool - * @param value to be pushed - */ - public PUSH(final ConstantPoolGen cp, final Character value) { - this(cp, value.charValue()); - } - - - /** - * @param cp Constant pool - * @param value to be pushed - */ - public PUSH(final ConstantPoolGen cp, final Boolean value) { - this(cp, value.booleanValue()); - } - - - @Override - public InstructionList getInstructionList() { - return new InstructionList(instruction); - } - - - public Instruction getInstruction() { - return instruction; - } - - - /** - * @return mnemonic for instruction - */ - @Override - public String toString() { - return instruction + " (PUSH)"; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/PUTFIELD.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/PUTFIELD.java deleted file mode 100644 index 0abb9ff8..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/PUTFIELD.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import org.apache.bcel.Const; -import org.apache.bcel.ExceptionConst; - -/** - * PUTFIELD - Put field in object - * 
Stack: ..., objectref, value -> ...
- * OR - * 
Stack: ..., objectref, value.word1, value.word2 -> ...
- * - */ -public class PUTFIELD extends FieldInstruction implements PopInstruction, ExceptionThrower { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - PUTFIELD() { - } - - - public PUTFIELD(final int index) { - super(Const.PUTFIELD, index); - } - - - @Override - public int consumeStack( final ConstantPoolGen cpg ) { - return getFieldSize(cpg) + 1; - } - - - @Override - public Class[] getExceptions() { - return ExceptionConst.createExceptions(ExceptionConst.EXCS.EXCS_FIELD_AND_METHOD_RESOLUTION, - ExceptionConst.NULL_POINTER_EXCEPTION, - ExceptionConst.INCOMPATIBLE_CLASS_CHANGE_ERROR); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitExceptionThrower(this); - v.visitStackConsumer(this); - v.visitPopInstruction(this); - v.visitTypedInstruction(this); - v.visitLoadClass(this); - v.visitCPInstruction(this); - v.visitFieldOrMethod(this); - v.visitFieldInstruction(this); - v.visitPUTFIELD(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/PUTSTATIC.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/PUTSTATIC.java deleted file mode 100644 index 11de13cd..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/PUTSTATIC.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import org.apache.bcel.Const; -import org.apache.bcel.ExceptionConst; - -/** - * PUTSTATIC - Put static field in class - * 
Stack: ..., value -> ...
- * OR - * 
Stack: ..., value.word1, value.word2 -> ...
- * - */ -public class PUTSTATIC extends FieldInstruction implements ExceptionThrower, PopInstruction { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - PUTSTATIC() { - } - - - public PUTSTATIC(final int index) { - super(Const.PUTSTATIC, index); - } - - - @Override - public int consumeStack( final ConstantPoolGen cpg ) { - return getFieldSize(cpg); - } - - - @Override - public Class[] getExceptions() { - return ExceptionConst.createExceptions(ExceptionConst.EXCS.EXCS_FIELD_AND_METHOD_RESOLUTION, - ExceptionConst.INCOMPATIBLE_CLASS_CHANGE_ERROR); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitExceptionThrower(this); - v.visitStackConsumer(this); - v.visitPopInstruction(this); - v.visitTypedInstruction(this); - v.visitLoadClass(this); - v.visitCPInstruction(this); - v.visitFieldOrMethod(this); - v.visitFieldInstruction(this); - v.visitPUTSTATIC(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/PopInstruction.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/PopInstruction.java deleted file mode 100644 index 1efb94c7..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/PopInstruction.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * Denotes an unparameterized instruction to pop a value on top from the stack, - * such as ISTORE, POP, PUTSTATIC. - * - * @see ISTORE - * @see POP - */ -public interface PopInstruction extends StackConsumer { -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/PushInstruction.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/PushInstruction.java deleted file mode 100644 index f05dffe2..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/PushInstruction.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * Denotes an unparameterized instruction to produce a value on top of the stack, - * such as ILOAD, LDC, SIPUSH, DUP, ICONST, etc. - * - - * @see ILOAD - * @see ICONST - * @see LDC - * @see DUP - * @see SIPUSH - * @see GETSTATIC - */ -public interface PushInstruction extends StackProducer { -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/RET.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/RET.java deleted file mode 100644 index 45f6db9e..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/RET.java +++ /dev/null @@ -1,146 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.util.ByteSequence; - -/** - * RET - Return from subroutine - * - * 
Stack: ... -> ...
- * - */ -public class RET extends Instruction implements IndexedInstruction, TypedInstruction { - - private boolean wide; - private int index; // index to local variable containg the return address - - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - RET() { - } - - - public RET(final int index) { - super(org.apache.bcel.Const.RET, (short) 2); - setIndex(index); // May set wide as side effect - } - - - /** - * Dump instruction as byte code to stream out. - * @param out Output stream - */ - @Override - public void dump( final DataOutputStream out ) throws IOException { - if (wide) { - out.writeByte(org.apache.bcel.Const.WIDE); - } - out.writeByte(super.getOpcode()); - if (wide) { - out.writeShort(index); - } else { - out.writeByte(index); - } - } - - - private void setWide() { - wide = index > org.apache.bcel.Const.MAX_BYTE; - if (wide) { - super.setLength(4); // Including the wide byte - } else { - super.setLength(2); - } - } - - - /** - * Read needed data (e.g. index) from file. - */ - @Override - protected void initFromFile( final ByteSequence bytes, final boolean wide ) throws IOException { - this.wide = wide; - if (wide) { - index = bytes.readUnsignedShort(); - super.setLength(4); - } else { - index = bytes.readUnsignedByte(); - super.setLength(2); - } - } - - - /** - * @return index of local variable containg the return address - */ - @Override - public final int getIndex() { - return index; - } - - - /** - * Set index of local variable containg the return address - */ - @Override - public final void setIndex( final int n ) { - if (n < 0) { - throw new ClassGenException("Negative index value: " + n); - } - index = n; - setWide(); - } - - - /** - * @return mnemonic for instruction - */ - @Override - public String toString( final boolean verbose ) { - return super.toString(verbose) + " " + index; - } - - - /** @return return address type - */ - @Override - public Type getType( final ConstantPoolGen cp ) { - return ReturnaddressType.NO_TARGET; - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitRET(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/RETURN.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/RETURN.java deleted file mode 100644 index 17ec78f0..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/RETURN.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * RETURN - Return from void method - * 
Stack: ... -> <empty>
- * - */ -public class RETURN extends ReturnInstruction { - - public RETURN() { - super(org.apache.bcel.Const.RETURN); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitExceptionThrower(this); - v.visitTypedInstruction(this); - v.visitStackConsumer(this); - v.visitReturnInstruction(this); - v.visitRETURN(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ReferenceType.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ReferenceType.java deleted file mode 100644 index 4178cb65..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ReferenceType.java +++ /dev/null @@ -1,329 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import org.apache.bcel.Const; -import org.apache.bcel.Repository; -import org.apache.bcel.classfile.JavaClass; - -/** - * Super class for object and array types. - * - */ -public abstract class ReferenceType extends Type { - - protected ReferenceType(final byte t, final String s) { - super(t, s); - } - - - /** Class is non-abstract but not instantiable from the outside - */ - ReferenceType() { - super(Const.T_OBJECT, ""); - } - - - /** - * Return true iff this type is castable to another type t as defined in - * the JVM specification. The case where this is Type.NULL is not - * defined (see the CHECKCAST definition in the JVM specification). - * However, because e.g. CHECKCAST doesn't throw a - * ClassCastException when casting a null reference to any Object, - * true is returned in this case. - * - * @throws ClassNotFoundException if any classes or interfaces required - * to determine assignment compatibility can't be found - */ - public boolean isCastableTo( final Type t ) throws ClassNotFoundException { - if (this.equals(Type.NULL)) { - return t instanceof ReferenceType; // If this is ever changed in isAssignmentCompatible() - } - return isAssignmentCompatibleWith(t); - /* Yes, it's true: It's the same definition. - * See vmspec2 AASTORE / CHECKCAST definitions. - */ - } - - - /** - * Return true iff this is assignment compatible with another type t - * as defined in the JVM specification; see the AASTORE definition - * there. - * @throws ClassNotFoundException if any classes or interfaces required - * to determine assignment compatibility can't be found - */ - public boolean isAssignmentCompatibleWith( final Type t ) throws ClassNotFoundException { - if (!(t instanceof ReferenceType)) { - return false; - } - final ReferenceType T = (ReferenceType) t; - if (this.equals(Type.NULL)) { - return true; // This is not explicitely stated, but clear. Isn't it? - } - /* If this is a class type then - */ - if ((this instanceof ObjectType) && (((ObjectType) this).referencesClassExact())) { - /* If T is a class type, then this must be the same class as T, - or this must be a subclass of T; - */ - if ((T instanceof ObjectType) && (((ObjectType) T).referencesClassExact())) { - if (this.equals(T)) { - return true; - } - if (Repository.instanceOf(((ObjectType) this).getClassName(), ((ObjectType) T) - .getClassName())) { - return true; - } - } - /* If T is an interface type, this must implement interface T. - */ - if ((T instanceof ObjectType) && (((ObjectType) T).referencesInterfaceExact())) { - if (Repository.implementationOf(((ObjectType) this).getClassName(), - ((ObjectType) T).getClassName())) { - return true; - } - } - } - /* If this is an interface type, then: - */ - if ((this instanceof ObjectType) && (((ObjectType) this).referencesInterfaceExact())) { - /* If T is a class type, then T must be Object (�2.4.7). - */ - if ((T instanceof ObjectType) && (((ObjectType) T).referencesClassExact())) { - if (T.equals(Type.OBJECT)) { - return true; - } - } - /* If T is an interface type, then T must be the same interface - * as this or a superinterface of this (�2.13.2). - */ - if ((T instanceof ObjectType) && (((ObjectType) T).referencesInterfaceExact())) { - if (this.equals(T)) { - return true; - } - if (Repository.implementationOf(((ObjectType) this).getClassName(), - ((ObjectType) T).getClassName())) { - return true; - } - } - } - /* If this is an array type, namely, the type SC[], that is, an - * array of components of type SC, then: - */ - if (this instanceof ArrayType) { - /* If T is a class type, then T must be Object (�2.4.7). - */ - if ((T instanceof ObjectType) && (((ObjectType) T).referencesClassExact())) { - if (T.equals(Type.OBJECT)) { - return true; - } - } - /* If T is an array type TC[], that is, an array of components - * of type TC, then one of the following must be true: - */ - if (T instanceof ArrayType) { - /* TC and SC are the same primitive type (�2.4.1). - */ - final Type sc = ((ArrayType) this).getElementType(); - final Type tc = ((ArrayType) T).getElementType(); - if (sc instanceof BasicType && tc instanceof BasicType && sc.equals(tc)) { - return true; - } - /* TC and SC are reference types (�2.4.6), and type SC is - * assignable to TC by these runtime rules. - */ - if (tc instanceof ReferenceType && sc instanceof ReferenceType - && ((ReferenceType) sc).isAssignmentCompatibleWith(tc)) { - return true; - } - } - /* If T is an interface type, T must be one of the interfaces implemented by arrays (�2.15). */ - // TODO: Check if this is still valid or find a way to dynamically find out which - // interfaces arrays implement. However, as of the JVM specification edition 2, there - // are at least two different pages where assignment compatibility is defined and - // on one of them "interfaces implemented by arrays" is exchanged with "'Cloneable' or - // 'java.io.Serializable'" - if ((T instanceof ObjectType) && (((ObjectType) T).referencesInterfaceExact())) { - for (final String element : Const.getInterfacesImplementedByArrays()) { - if (T.equals(ObjectType.getInstance(element))) { - return true; - } - } - } - } - return false; // default. - } - - - /** - * This commutative operation returns the first common superclass (narrowest ReferenceType - * referencing a class, not an interface). - * If one of the types is a superclass of the other, the former is returned. - * If "this" is Type.NULL, then t is returned. - * If t is Type.NULL, then "this" is returned. - * If "this" equals t ['this.equals(t)'] "this" is returned. - * If "this" or t is an ArrayType, then Type.OBJECT is returned; - * unless their dimensions match. Then an ArrayType of the same - * number of dimensions is returned, with its basic type being the - * first common super class of the basic types of "this" and t. - * If "this" or t is a ReferenceType referencing an interface, then Type.OBJECT is returned. - * If not all of the two classes' superclasses cannot be found, "null" is returned. - * See the JVM specification edition 2, "�4.9.2 The Bytecode Verifier". - * - * @throws ClassNotFoundException on failure to find superclasses of this - * type, or the type passed as a parameter - */ - public ReferenceType getFirstCommonSuperclass( final ReferenceType t ) throws ClassNotFoundException { - if (this.equals(Type.NULL)) { - return t; - } - if (t.equals(Type.NULL)) { - return this; - } - if (this.equals(t)) { - return this; - /* - * TODO: Above sounds a little arbitrary. On the other hand, there is - * no object referenced by Type.NULL so we can also say all the objects - * referenced by Type.NULL were derived from java.lang.Object. - * However, the Java Language's "instanceof" operator proves us wrong: - * "null" is not referring to an instance of java.lang.Object :) - */ - } - /* This code is from a bug report by Konstantin Shagin */ - if ((this instanceof ArrayType) && (t instanceof ArrayType)) { - final ArrayType arrType1 = (ArrayType) this; - final ArrayType arrType2 = (ArrayType) t; - if ((arrType1.getDimensions() == arrType2.getDimensions()) - && arrType1.getBasicType() instanceof ObjectType - && arrType2.getBasicType() instanceof ObjectType) { - return new ArrayType(((ObjectType) arrType1.getBasicType()) - .getFirstCommonSuperclass((ObjectType) arrType2.getBasicType()), arrType1 - .getDimensions()); - } - } - if ((this instanceof ArrayType) || (t instanceof ArrayType)) { - return Type.OBJECT; - // TODO: Is there a proof of OBJECT being the direct ancestor of every ArrayType? - } - if (((this instanceof ObjectType) && ((ObjectType) this).referencesInterfaceExact()) - || ((t instanceof ObjectType) && ((ObjectType) t).referencesInterfaceExact())) { - return Type.OBJECT; - // TODO: The above line is correct comparing to the vmspec2. But one could - // make class file verification a bit stronger here by using the notion of - // superinterfaces or even castability or assignment compatibility. - } - // this and t are ObjectTypes, see above. - final ObjectType thiz = (ObjectType) this; - final ObjectType other = (ObjectType) t; - final JavaClass[] thiz_sups = Repository.getSuperClasses(thiz.getClassName()); - final JavaClass[] other_sups = Repository.getSuperClasses(other.getClassName()); - if ((thiz_sups == null) || (other_sups == null)) { - return null; - } - // Waaahh... - final JavaClass[] this_sups = new JavaClass[thiz_sups.length + 1]; - final JavaClass[] t_sups = new JavaClass[other_sups.length + 1]; - System.arraycopy(thiz_sups, 0, this_sups, 1, thiz_sups.length); - System.arraycopy(other_sups, 0, t_sups, 1, other_sups.length); - this_sups[0] = Repository.lookupClass(thiz.getClassName()); - t_sups[0] = Repository.lookupClass(other.getClassName()); - for (final JavaClass t_sup : t_sups) { - for (final JavaClass this_sup : this_sups) { - if (this_sup.equals(t_sup)) { - return ObjectType.getInstance(this_sup.getClassName()); - } - } - } - // Huh? Did you ask for Type.OBJECT's superclass?? - return null; - } - - /** - * This commutative operation returns the first common superclass (narrowest ReferenceType - * referencing a class, not an interface). - * If one of the types is a superclass of the other, the former is returned. - * If "this" is Type.NULL, then t is returned. - * If t is Type.NULL, then "this" is returned. - * If "this" equals t ['this.equals(t)'] "this" is returned. - * If "this" or t is an ArrayType, then Type.OBJECT is returned. - * If "this" or t is a ReferenceType referencing an interface, then Type.OBJECT is returned. - * If not all of the two classes' superclasses cannot be found, "null" is returned. - * See the JVM specification edition 2, "�4.9.2 The Bytecode Verifier". - * - * @deprecated use getFirstCommonSuperclass(ReferenceType t) which has - * slightly changed semantics. - * @throws ClassNotFoundException on failure to find superclasses of this - * type, or the type passed as a parameter - */ - @Deprecated - public ReferenceType firstCommonSuperclass( final ReferenceType t ) throws ClassNotFoundException { - if (this.equals(Type.NULL)) { - return t; - } - if (t.equals(Type.NULL)) { - return this; - } - if (this.equals(t)) { - return this; - /* - * TODO: Above sounds a little arbitrary. On the other hand, there is - * no object referenced by Type.NULL so we can also say all the objects - * referenced by Type.NULL were derived from java.lang.Object. - * However, the Java Language's "instanceof" operator proves us wrong: - * "null" is not referring to an instance of java.lang.Object :) - */ - } - if ((this instanceof ArrayType) || (t instanceof ArrayType)) { - return Type.OBJECT; - // TODO: Is there a proof of OBJECT being the direct ancestor of every ArrayType? - } - if (((this instanceof ObjectType) && ((ObjectType) this).referencesInterface()) - || ((t instanceof ObjectType) && ((ObjectType) t).referencesInterface())) { - return Type.OBJECT; - // TODO: The above line is correct comparing to the vmspec2. But one could - // make class file verification a bit stronger here by using the notion of - // superinterfaces or even castability or assignment compatibility. - } - // this and t are ObjectTypes, see above. - final ObjectType thiz = (ObjectType) this; - final ObjectType other = (ObjectType) t; - final JavaClass[] thiz_sups = Repository.getSuperClasses(thiz.getClassName()); - final JavaClass[] other_sups = Repository.getSuperClasses(other.getClassName()); - if ((thiz_sups == null) || (other_sups == null)) { - return null; - } - // Waaahh... - final JavaClass[] this_sups = new JavaClass[thiz_sups.length + 1]; - final JavaClass[] t_sups = new JavaClass[other_sups.length + 1]; - System.arraycopy(thiz_sups, 0, this_sups, 1, thiz_sups.length); - System.arraycopy(other_sups, 0, t_sups, 1, other_sups.length); - this_sups[0] = Repository.lookupClass(thiz.getClassName()); - t_sups[0] = Repository.lookupClass(other.getClassName()); - for (final JavaClass t_sup : t_sups) { - for (final JavaClass this_sup : this_sups) { - if (this_sup.equals(t_sup)) { - return ObjectType.getInstance(this_sup.getClassName()); - } - } - } - // Huh? Did you ask for Type.OBJECT's superclass?? - return null; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ReturnInstruction.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ReturnInstruction.java deleted file mode 100644 index f70818f5..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ReturnInstruction.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import org.apache.bcel.Const; -import org.apache.bcel.ExceptionConst; - -/** - * Super class for the xRETURN family of instructions. - * - */ -public abstract class ReturnInstruction extends Instruction implements ExceptionThrower, - TypedInstruction, StackConsumer { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - ReturnInstruction() { - } - - - /** - * @param opcode of instruction - */ - protected ReturnInstruction(final short opcode) { - super(opcode, (short) 1); - } - - - public Type getType() { - final short _opcode = super.getOpcode(); - switch (_opcode) { - case Const.IRETURN: - return Type.INT; - case Const.LRETURN: - return Type.LONG; - case Const.FRETURN: - return Type.FLOAT; - case Const.DRETURN: - return Type.DOUBLE; - case Const.ARETURN: - return Type.OBJECT; - case Const.RETURN: - return Type.VOID; - default: // Never reached - throw new ClassGenException("Unknown type " + _opcode); - } - } - - - @Override - public Class[] getExceptions() { - return new Class[] { - ExceptionConst.ILLEGAL_MONITOR_STATE - }; - } - - - /** @return type associated with the instruction - */ - @Override - public Type getType( final ConstantPoolGen cp ) { - return getType(); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ReturnaddressType.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ReturnaddressType.java deleted file mode 100644 index 95731a6f..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/ReturnaddressType.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import org.apache.bcel.Const; - -/** - * Returnaddress, the type JSR or JSR_W instructions push upon the stack. - * - * see vmspec2 �3.3.3 - */ -public class ReturnaddressType extends Type { - - public static final ReturnaddressType NO_TARGET = new ReturnaddressType(); - private InstructionHandle returnTarget; - - - /** - * A Returnaddress [that doesn't know where to return to]. - */ - private ReturnaddressType() { - super(Const.T_ADDRESS, ""); - } - - - /** - * Creates a ReturnaddressType object with a target. - */ - public ReturnaddressType(final InstructionHandle returnTarget) { - super(Const.T_ADDRESS, ""); - this.returnTarget = returnTarget; - } - - - /** @return a hash code value for the object. - */ - @Override - public int hashCode() { - if (returnTarget == null) { - return 0; - } - return returnTarget.hashCode(); - } - - - /** - * Returns if the two Returnaddresses refer to the same target. - */ - @Override - public boolean equals( final Object rat ) { - if (!(rat instanceof ReturnaddressType)) { - return false; - } - final ReturnaddressType that = (ReturnaddressType) rat; - if (this.returnTarget == null || that.returnTarget == null) { - return that.returnTarget == this.returnTarget; - } - return that.returnTarget.equals(this.returnTarget); - } - - - /** - * @return the target of this ReturnaddressType - */ - public InstructionHandle getTarget() { - return returnTarget; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/SALOAD.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/SALOAD.java deleted file mode 100644 index 116a1467..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/SALOAD.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * SALOAD - Load short from array - * 
Stack: ..., arrayref, index -> ..., value
- * - */ -public class SALOAD extends ArrayInstruction implements StackProducer { - - public SALOAD() { - super(org.apache.bcel.Const.SALOAD); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackProducer(this); - v.visitExceptionThrower(this); - v.visitTypedInstruction(this); - v.visitArrayInstruction(this); - v.visitSALOAD(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/SASTORE.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/SASTORE.java deleted file mode 100644 index 23e8d071..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/SASTORE.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * SASTORE - Store into short array - * 
Stack: ..., arrayref, index, value -> ...
- * - */ -public class SASTORE extends ArrayInstruction implements StackConsumer { - - public SASTORE() { - super(org.apache.bcel.Const.SASTORE); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackConsumer(this); - v.visitExceptionThrower(this); - v.visitTypedInstruction(this); - v.visitArrayInstruction(this); - v.visitSASTORE(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/SIPUSH.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/SIPUSH.java deleted file mode 100644 index 3bb003c3..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/SIPUSH.java +++ /dev/null @@ -1,109 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.util.ByteSequence; - -/** - * SIPUSH - Push short - * - * 
Stack: ... -> ..., value
- * - */ -public class SIPUSH extends Instruction implements ConstantPushInstruction { - - private short b; - - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - SIPUSH() { - } - - - public SIPUSH(final short b) { - super(org.apache.bcel.Const.SIPUSH, (short) 3); - this.b = b; - } - - - /** - * Dump instruction as short code to stream out. - */ - @Override - public void dump( final DataOutputStream out ) throws IOException { - super.dump(out); - out.writeShort(b); - } - - - /** - * @return mnemonic for instruction - */ - @Override - public String toString( final boolean verbose ) { - return super.toString(verbose) + " " + b; - } - - - /** - * Read needed data (e.g. index) from file. - */ - @Override - protected void initFromFile( final ByteSequence bytes, final boolean wide ) throws IOException { - super.setLength(3); - b = bytes.readShort(); - } - - - @Override - public Number getValue() { - return Integer.valueOf(b); - } - - - /** @return Type.SHORT - */ - @Override - public Type getType( final ConstantPoolGen cp ) { - return Type.SHORT; - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitPushInstruction(this); - v.visitStackProducer(this); - v.visitTypedInstruction(this); - v.visitConstantPushInstruction(this); - v.visitSIPUSH(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/SWAP.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/SWAP.java deleted file mode 100644 index 0a674a5e..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/SWAP.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * SWAP - Swa top operand stack word - * 
Stack: ..., word2, word1 -> ..., word1, word2
- * - */ -public class SWAP extends StackInstruction implements StackConsumer, StackProducer { - - public SWAP() { - super(org.apache.bcel.Const.SWAP); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackConsumer(this); - v.visitStackProducer(this); - v.visitStackInstruction(this); - v.visitSWAP(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/SWITCH.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/SWITCH.java deleted file mode 100644 index 5172ed1b..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/SWITCH.java +++ /dev/null @@ -1,155 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * SWITCH - Branch depending on int value, generates either LOOKUPSWITCH or - * TABLESWITCH instruction, depending on whether the match values (int[]) can be - * sorted with no gaps between the numbers. - * - */ -public final class SWITCH implements CompoundInstruction { - - private int[] match; - private InstructionHandle[] targets; - private Select instruction; - private int matchLength; - - - /** - * Template for switch() constructs. If the match array can be - * sorted in ascending order with gaps no larger than max_gap - * between the numbers, a TABLESWITCH instruction is generated, and - * a LOOKUPSWITCH otherwise. The former may be more efficient, but - * needs more space. - * - * Note, that the key array always will be sorted, though we leave - * the original arrays unaltered. - * - * @param match array of match values (case 2: ... case 7: ..., etc.) - * @param targets the instructions to be branched to for each case - * @param target the default target - * @param max_gap maximum gap that may between case branches - */ - public SWITCH(final int[] match, final InstructionHandle[] targets, final InstructionHandle target, final int max_gap) { - this.match = match.clone(); - this.targets = targets.clone(); - if ((matchLength = match.length) < 2) { - instruction = new TABLESWITCH(match, targets, target); - } else { - sort(0, matchLength - 1); - if (matchIsOrdered(max_gap)) { - fillup(max_gap, target); - instruction = new TABLESWITCH(this.match, this.targets, target); - } else { - instruction = new LOOKUPSWITCH(this.match, this.targets, target); - } - } - } - - - public SWITCH(final int[] match, final InstructionHandle[] targets, final InstructionHandle target) { - this(match, targets, target, 1); - } - - - private void fillup( final int max_gap, final InstructionHandle target ) { - final int max_size = matchLength + matchLength * max_gap; - final int[] m_vec = new int[max_size]; - final InstructionHandle[] t_vec = new InstructionHandle[max_size]; - int count = 1; - m_vec[0] = match[0]; - t_vec[0] = targets[0]; - for (int i = 1; i < matchLength; i++) { - final int prev = match[i - 1]; - final int gap = match[i] - prev; - for (int j = 1; j < gap; j++) { - m_vec[count] = prev + j; - t_vec[count] = target; - count++; - } - m_vec[count] = match[i]; - t_vec[count] = targets[i]; - count++; - } - match = new int[count]; - targets = new InstructionHandle[count]; - System.arraycopy(m_vec, 0, match, 0, count); - System.arraycopy(t_vec, 0, targets, 0, count); - } - - - /** - * Sort match and targets array with QuickSort. - */ - private void sort( final int l, final int r ) { - int i = l; - int j = r; - int h; - final int m = match[(l + r) >>> 1]; - InstructionHandle h2; - do { - while (match[i] < m) { - i++; - } - while (m < match[j]) { - j--; - } - if (i <= j) { - h = match[i]; - match[i] = match[j]; - match[j] = h; // Swap elements - h2 = targets[i]; - targets[i] = targets[j]; - targets[j] = h2; // Swap instructions, too - i++; - j--; - } - } while (i <= j); - if (l < j) { - sort(l, j); - } - if (i < r) { - sort(i, r); - } - } - - - /** - * @return match is sorted in ascending order with no gap bigger than max_gap? - */ - private boolean matchIsOrdered( final int max_gap ) { - for (int i = 1; i < matchLength; i++) { - if (match[i] - match[i - 1] > max_gap) { - return false; - } - } - return true; - } - - - @Override - public InstructionList getInstructionList() { - return new InstructionList(instruction); - } - - - public Instruction getInstruction() { - return instruction; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/Select.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/Select.java deleted file mode 100644 index ebb0e177..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/Select.java +++ /dev/null @@ -1,392 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.util.ByteSequence; - -/** - * Select - Abstract super class for LOOKUPSWITCH and TABLESWITCH instructions. - * - *

We use our super's {@code target} property as the default target. - * - * @see LOOKUPSWITCH - * @see TABLESWITCH - * @see InstructionList - */ -public abstract class Select extends BranchInstruction implements VariableLengthInstruction, - StackConsumer /* @since 6.0 */, StackProducer { - - /** - * @deprecated (since 6.0) will be made private; do not access directly, use getter/setter - */ - @Deprecated - protected int[] match; // matches, i.e., case 1: ... TODO could be package-protected? - - /** - * @deprecated (since 6.0) will be made private; do not access directly, use getter/setter - */ - @Deprecated - protected int[] indices; // target offsets TODO could be package-protected? - - /** - * @deprecated (since 6.0) will be made private; do not access directly, use getter/setter - */ - @Deprecated - protected InstructionHandle[] targets; // target objects in instruction list TODO could be package-protected? - - /** - * @deprecated (since 6.0) will be made private; do not access directly, use getter/setter - */ - @Deprecated - protected int fixed_length; // fixed length defined by subclasses TODO could be package-protected? - - /** - * @deprecated (since 6.0) will be made private; do not access directly, use getter/setter - */ - @Deprecated - protected int match_length; // number of cases TODO could be package-protected? - - /** - * @deprecated (since 6.0) will be made private; do not access directly, use getter/setter - */ - @Deprecated - protected int padding = 0; // number of pad bytes for alignment TODO could be package-protected? - - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - Select() { - } - - - /** - * (Match, target) pairs for switch. - * `Match' and `targets' must have the same length of course. - * - * @param match array of matching values - * @param targets instruction targets - * @param defaultTarget default instruction target - */ - Select(final short opcode, final int[] match, final InstructionHandle[] targets, final InstructionHandle defaultTarget) { - // don't set default target before instuction is built - super(opcode, null); - this.match = match; - this.targets = targets; - // now it's safe to set default target - setTarget(defaultTarget); - for (final InstructionHandle target2 : targets) { - notifyTarget(null, target2, this); - } - if ((match_length = match.length) != targets.length) { - throw new ClassGenException("Match and target array have not the same length: Match length: " + - match.length + " Target length: " + targets.length); - } - indices = new int[match_length]; - } - - - /** - * Since this is a variable length instruction, it may shift the following - * instructions which then need to update their position. - * - * Called by InstructionList.setPositions when setting the position for every - * instruction. In the presence of variable length instructions `setPositions' - * performs multiple passes over the instruction list to calculate the - * correct (byte) positions and offsets by calling this function. - * - * @param offset additional offset caused by preceding (variable length) instructions - * @param max_offset the maximum offset that may be caused by these instructions - * @return additional offset caused by possible change of this instruction's length - */ - @Override - protected int updatePosition( final int offset, final int max_offset ) { - setPosition(getPosition() + offset); // Additional offset caused by preceding SWITCHs, GOTOs, etc. - final short old_length = (short) super.getLength(); - /* Alignment on 4-byte-boundary, + 1, because of tag byte. - */ - padding = (4 - ((getPosition() + 1) % 4)) % 4; - super.setLength((short) (fixed_length + padding)); // Update length - return super.getLength() - old_length; - } - - - /** - * Dump instruction as byte code to stream out. - * @param out Output stream - */ - @Override - public void dump( final DataOutputStream out ) throws IOException { - out.writeByte(super.getOpcode()); - for (int i = 0; i < padding; i++) { - out.writeByte(0); - } - super.setIndex(getTargetOffset()); // Write default target offset - out.writeInt(super.getIndex()); - } - - - /** - * Read needed data (e.g. index) from file. - */ - @Override - protected void initFromFile( final ByteSequence bytes, final boolean wide ) throws IOException { - padding = (4 - (bytes.getIndex() % 4)) % 4; // Compute number of pad bytes - for (int i = 0; i < padding; i++) { - bytes.readByte(); - } - // Default branch target common for both cases (TABLESWITCH, LOOKUPSWITCH) - super.setIndex(bytes.readInt()); - } - - - /** - * @return mnemonic for instruction - */ - @Override - public String toString( final boolean verbose ) { - final StringBuilder buf = new StringBuilder(super.toString(verbose)); - if (verbose) { - for (int i = 0; i < match_length; i++) { - String s = "null"; - if (targets[i] != null) { - s = targets[i].getInstruction().toString(); - } - buf.append("(").append(match[i]).append(", ").append(s).append(" = {").append( - indices[i]).append("})"); - } - } else { - buf.append(" ..."); - } - return buf.toString(); - } - - - /** - * Set branch target for `i'th case - */ - public void setTarget( final int i, final InstructionHandle target ) { // TODO could be package-protected? - notifyTarget(targets[i], target, this); - targets[i] = target; - } - - - /** - * @param old_ih old target - * @param new_ih new target - */ - @Override - public void updateTarget( final InstructionHandle old_ih, final InstructionHandle new_ih ) { - boolean targeted = false; - if (super.getTarget() == old_ih) { - targeted = true; - setTarget(new_ih); - } - for (int i = 0; i < targets.length; i++) { - if (targets[i] == old_ih) { - targeted = true; - setTarget(i, new_ih); - } - } - if (!targeted) { - throw new ClassGenException("Not targeting " + old_ih); - } - } - - - /** - * @return true, if ih is target of this instruction - */ - @Override - public boolean containsTarget( final InstructionHandle ih ) { - if (super.getTarget() == ih) { - return true; - } - for (final InstructionHandle target2 : targets) { - if (target2 == ih) { - return true; - } - } - return false; - } - - - @Override - protected Object clone() throws CloneNotSupportedException { - final Select copy = (Select) super.clone(); - copy.match = match.clone(); - copy.indices = indices.clone(); - copy.targets = targets.clone(); - return copy; - } - - - /** - * Inform targets that they're not targeted anymore. - */ - @Override - void dispose() { - super.dispose(); - for (final InstructionHandle target2 : targets) { - target2.removeTargeter(this); - } - } - - - /** - * @return array of match indices - */ - public int[] getMatchs() { - return match; - } - - - /** - * @return array of match target offsets - */ - public int[] getIndices() { - return indices; - } - - - /** - * @return array of match targets - */ - public InstructionHandle[] getTargets() { - return targets; - } - - /** - * @return match entry - * @since 6.0 - */ - final int getMatch(final int index) { - return match[index]; - } - - - /** - * @return index entry from indices - * @since 6.0 - */ - final int getIndices(final int index) { - return indices[index]; - } - - /** - * @return target entry - * @since 6.0 - */ - final InstructionHandle getTarget(final int index) { - return targets[index]; - } - - - /** - * @return the fixed_length - * @since 6.0 - */ - final int getFixed_length() { - return fixed_length; - } - - - /** - * @param fixed_length the fixed_length to set - * @since 6.0 - */ - final void setFixed_length(final int fixed_length) { - this.fixed_length = fixed_length; - } - - - /** - * @return the match_length - * @since 6.0 - */ - final int getMatch_length() { - return match_length; - } - - - /** - * @param match_length the match_length to set - * @since 6.0 - */ - final int setMatch_length(final int match_length) { - this.match_length = match_length; - return match_length; - } - - /** - * - * @param index - * @param value - * @since 6.0 - */ - final void setMatch(final int index, final int value) { - match[index] = value; - } - - /** - * - * @param array - * @since 6.0 - */ - final void setIndices(final int[] array) { - indices = array; - } - - /** - * - * @param array - * @since 6.0 - */ - final void setMatches(final int[] array) { - match = array; - } - - /** - * - * @param array - * @since 6.0 - */ - final void setTargets(final InstructionHandle[] array) { - targets = array; - } - - /** - * - * @return the padding - * @since 6.0 - */ - final int getPadding() { - return padding; - } - - - /** @since 6.0 */ - final int setIndices(final int i, final int value) { - indices[i] = value; - return value; // Allow use in nested calls - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/SimpleElementValueGen.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/SimpleElementValueGen.java deleted file mode 100644 index 169a3dca..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/SimpleElementValueGen.java +++ /dev/null @@ -1,269 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.classfile.ConstantDouble; -import org.apache.bcel.classfile.ConstantFloat; -import org.apache.bcel.classfile.ConstantInteger; -import org.apache.bcel.classfile.ConstantLong; -import org.apache.bcel.classfile.ConstantUtf8; -import org.apache.bcel.classfile.ElementValue; -import org.apache.bcel.classfile.SimpleElementValue; - -/** - * @since 6.0 - */ -public class SimpleElementValueGen extends ElementValueGen -{ - // For primitive types and string type, this points to the value entry in - // the cpGen - // For 'class' this points to the class entry in the cpGen - private int idx; - - // ctors for each supported type... type could be inferred but for now lets - // force it to be passed - /** - * Protected ctor used for deserialization, doesn't *put* an entry in the - * constant pool, assumes the one at the supplied index is correct. - */ - protected SimpleElementValueGen(final int type, final int idx, final ConstantPoolGen cpGen) - { - super(type, cpGen); - this.idx = idx; - } - - public SimpleElementValueGen(final int type, final ConstantPoolGen cpGen, final int value) - { - super(type, cpGen); - idx = getConstantPool().addInteger(value); - } - - public SimpleElementValueGen(final int type, final ConstantPoolGen cpGen, final long value) - { - super(type, cpGen); - idx = getConstantPool().addLong(value); - } - - public SimpleElementValueGen(final int type, final ConstantPoolGen cpGen, final double value) - { - super(type, cpGen); - idx = getConstantPool().addDouble(value); - } - - public SimpleElementValueGen(final int type, final ConstantPoolGen cpGen, final float value) - { - super(type, cpGen); - idx = getConstantPool().addFloat(value); - } - - public SimpleElementValueGen(final int type, final ConstantPoolGen cpGen, final short value) - { - super(type, cpGen); - idx = getConstantPool().addInteger(value); - } - - public SimpleElementValueGen(final int type, final ConstantPoolGen cpGen, final byte value) - { - super(type, cpGen); - idx = getConstantPool().addInteger(value); - } - - public SimpleElementValueGen(final int type, final ConstantPoolGen cpGen, final char value) - { - super(type, cpGen); - idx = getConstantPool().addInteger(value); - } - - public SimpleElementValueGen(final int type, final ConstantPoolGen cpGen, final boolean value) - { - super(type, cpGen); - if (value) { - idx = getConstantPool().addInteger(1); - } else { - idx = getConstantPool().addInteger(0); - } - } - - public SimpleElementValueGen(final int type, final ConstantPoolGen cpGen, final String value) - { - super(type, cpGen); - idx = getConstantPool().addUtf8(value); - } - - /** - * The boolean controls whether we copy info from the 'old' constant pool to - * the 'new'. You need to use this ctor if the annotation is being copied - * from one file to another. - */ - public SimpleElementValueGen(final SimpleElementValue value, - final ConstantPoolGen cpool, final boolean copyPoolEntries) - { - super(value.getElementValueType(), cpool); - if (!copyPoolEntries) - { - // J5ASSERT: Could assert value.stringifyValue() is the same as - // cpool.getConstant(SimpleElementValuevalue.getIndex()) - idx = value.getIndex(); - } - else - { - switch (value.getElementValueType()) - { - case STRING: - idx = cpool.addUtf8(value.getValueString()); - break; - case PRIMITIVE_INT: - idx = cpool.addInteger(value.getValueInt()); - break; - case PRIMITIVE_BYTE: - idx = cpool.addInteger(value.getValueByte()); - break; - case PRIMITIVE_CHAR: - idx = cpool.addInteger(value.getValueChar()); - break; - case PRIMITIVE_LONG: - idx = cpool.addLong(value.getValueLong()); - break; - case PRIMITIVE_FLOAT: - idx = cpool.addFloat(value.getValueFloat()); - break; - case PRIMITIVE_DOUBLE: - idx = cpool.addDouble(value.getValueDouble()); - break; - case PRIMITIVE_BOOLEAN: - if (value.getValueBoolean()) - { - idx = cpool.addInteger(1); - } - else - { - idx = cpool.addInteger(0); - } - break; - case PRIMITIVE_SHORT: - idx = cpool.addInteger(value.getValueShort()); - break; - default: - throw new IllegalArgumentException( - "SimpleElementValueGen class does not know how to copy this type " + super.getElementValueType()); - } - } - } - - /** - * Return immutable variant - */ - @Override - public ElementValue getElementValue() - { - return new SimpleElementValue(super.getElementValueType(), idx, getConstantPool().getConstantPool()); - } - - public int getIndex() - { - return idx; - } - - public String getValueString() - { - if (super.getElementValueType() != STRING) { - throw new IllegalStateException( - "Dont call getValueString() on a non STRING ElementValue"); - } - final ConstantUtf8 c = (ConstantUtf8) getConstantPool().getConstant(idx); - return c.getBytes(); - } - - public int getValueInt() - { - if (super.getElementValueType() != PRIMITIVE_INT) { - throw new IllegalStateException( - "Dont call getValueString() on a non STRING ElementValue"); - } - final ConstantInteger c = (ConstantInteger) getConstantPool().getConstant(idx); - return c.getBytes(); - } - - // Whatever kind of value it is, return it as a string - @Override - public String stringifyValue() - { - switch (super.getElementValueType()) - { - case PRIMITIVE_INT: - final ConstantInteger c = (ConstantInteger) getConstantPool().getConstant(idx); - return Integer.toString(c.getBytes()); - case PRIMITIVE_LONG: - final ConstantLong j = (ConstantLong) getConstantPool().getConstant(idx); - return Long.toString(j.getBytes()); - case PRIMITIVE_DOUBLE: - final ConstantDouble d = (ConstantDouble) getConstantPool().getConstant(idx); - return Double.toString(d.getBytes()); - case PRIMITIVE_FLOAT: - final ConstantFloat f = (ConstantFloat) getConstantPool().getConstant(idx); - return Float.toString(f.getBytes()); - case PRIMITIVE_SHORT: - final ConstantInteger s = (ConstantInteger) getConstantPool().getConstant(idx); - return Integer.toString(s.getBytes()); - case PRIMITIVE_BYTE: - final ConstantInteger b = (ConstantInteger) getConstantPool().getConstant(idx); - return Integer.toString(b.getBytes()); - case PRIMITIVE_CHAR: - final ConstantInteger ch = (ConstantInteger) getConstantPool().getConstant(idx); - return Integer.toString(ch.getBytes()); - case PRIMITIVE_BOOLEAN: - final ConstantInteger bo = (ConstantInteger) getConstantPool().getConstant(idx); - if (bo.getBytes() == 0) { - return "false"; - } - return "true"; - case STRING: - final ConstantUtf8 cu8 = (ConstantUtf8) getConstantPool().getConstant(idx); - return cu8.getBytes(); - default: - throw new IllegalStateException( - "SimpleElementValueGen class does not know how to stringify type " + super.getElementValueType()); - } - } - - @Override - public void dump(final DataOutputStream dos) throws IOException - { - dos.writeByte(super.getElementValueType()); // u1 kind of value - switch (super.getElementValueType()) - { - case PRIMITIVE_INT: - case PRIMITIVE_BYTE: - case PRIMITIVE_CHAR: - case PRIMITIVE_FLOAT: - case PRIMITIVE_LONG: - case PRIMITIVE_BOOLEAN: - case PRIMITIVE_SHORT: - case PRIMITIVE_DOUBLE: - case STRING: - dos.writeShort(idx); - break; - default: - throw new IllegalStateException( - "SimpleElementValueGen doesnt know how to write out type " + super.getElementValueType()); - } - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/StackConsumer.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/StackConsumer.java deleted file mode 100644 index b5a55c95..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/StackConsumer.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * Denote an instruction that may consume a value from the stack. - * - */ -public interface StackConsumer { - - /** @return how many words are consumed from stack - */ - int consumeStack( ConstantPoolGen cpg ); -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/StackInstruction.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/StackInstruction.java deleted file mode 100644 index 8b4d9049..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/StackInstruction.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * Super class for stack operations like DUP and POP. - * - */ -public abstract class StackInstruction extends Instruction { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - StackInstruction() { - } - - - /** - * @param opcode instruction opcode - */ - protected StackInstruction(final short opcode) { - super(opcode, (short) 1); - } - - - /** @return Type.UNKNOWN - */ - public Type getType( final ConstantPoolGen cp ) { - return Type.UNKNOWN; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/StackProducer.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/StackProducer.java deleted file mode 100644 index b4e259e3..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/StackProducer.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * Denote an instruction that may produce a value on top of the stack - * (this excludes DUP_X1, e.g.) - * - */ -public interface StackProducer { - - /** @return how many words are produced on stack - */ - int produceStack( ConstantPoolGen cpg ); -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/StoreInstruction.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/StoreInstruction.java deleted file mode 100644 index e6650cbe..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/StoreInstruction.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * Denotes an unparameterized instruction to store a value into a local variable, - * e.g. ISTORE. - * - */ -public abstract class StoreInstruction extends LocalVariableInstruction implements PopInstruction { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - * tag and length are defined in readInstruction and initFromFile, respectively. - */ - StoreInstruction(final short canon_tag, final short c_tag) { - super(canon_tag, c_tag); - } - - - /** - * @param opcode Instruction opcode - * @param c_tag Instruction number for compact version, ASTORE_0, e.g. - * @param n local variable index (unsigned short) - */ - protected StoreInstruction(final short opcode, final short c_tag, final int n) { - super(opcode, c_tag, n); - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitStackConsumer(this); - v.visitPopInstruction(this); - v.visitTypedInstruction(this); - v.visitLocalVariableInstruction(this); - v.visitStoreInstruction(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/TABLESWITCH.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/TABLESWITCH.java deleted file mode 100644 index 3a7fb261..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/TABLESWITCH.java +++ /dev/null @@ -1,112 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.bcel.util.ByteSequence; - -/** - * TABLESWITCH - Switch within given range of values, i.e., low..high - * - * @see SWITCH - */ -public class TABLESWITCH extends Select { - - /** - * Empty constructor needed for Instruction.readInstruction. - * Not to be used otherwise. - */ - TABLESWITCH() { - } - - - /** - * @param match sorted array of match values, match[0] must be low value, - * match[match_length - 1] high value - * @param targets where to branch for matched values - * @param defaultTarget default branch - */ - public TABLESWITCH(final int[] match, final InstructionHandle[] targets, final InstructionHandle defaultTarget) { - super(org.apache.bcel.Const.TABLESWITCH, match, targets, defaultTarget); - /* Alignment remainder assumed 0 here, until dump time */ - final short _length = (short) (13 + getMatch_length() * 4); - super.setLength(_length); - setFixed_length(_length); - } - - - /** - * Dump instruction as byte code to stream out. - * @param out Output stream - */ - @Override - public void dump( final DataOutputStream out ) throws IOException { - super.dump(out); - final int _match_length = getMatch_length(); - final int low = (_match_length > 0) ? super.getMatch(0) : 0; - out.writeInt(low); - final int high = (_match_length > 0) ? super.getMatch(_match_length - 1) : 0; - out.writeInt(high); - for (int i = 0; i < _match_length; i++) { - out.writeInt(setIndices(i, getTargetOffset(super.getTarget(i)))); - } - } - - - /** - * Read needed data (e.g. index) from file. - */ - @Override - protected void initFromFile( final ByteSequence bytes, final boolean wide ) throws IOException { - super.initFromFile(bytes, wide); - final int low = bytes.readInt(); - final int high = bytes.readInt(); - final int _match_length = high - low + 1; - setMatch_length(_match_length); - final short _fixed_length = (short) (13 + _match_length * 4); - setFixed_length(_fixed_length); - super.setLength((short) (_fixed_length + super.getPadding())); - super.setMatches(new int[_match_length]); - super.setIndices(new int[_match_length]); - super.setTargets(new InstructionHandle[_match_length]); - for (int i = 0; i < _match_length; i++) { - super.setMatch(i, low + i); - super.setIndices(i, bytes.readInt()); - } - } - - - /** - * Call corresponding visitor method(s). The order is: - * Call visitor methods of implemented interfaces first, then - * call methods according to the class hierarchy in descending order, - * i.e., the most specific visitXXX() call comes last. - * - * @param v Visitor object - */ - @Override - public void accept( final Visitor v ) { - v.visitVariableLengthInstruction(this); - v.visitStackConsumer(this); - v.visitBranchInstruction(this); - v.visitSelect(this); - v.visitTABLESWITCH(this); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/TargetLostException.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/TargetLostException.java deleted file mode 100644 index baac6258..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/TargetLostException.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * Thrown by InstructionList.remove() when one or multiple disposed instructions - * are still being referenced by an InstructionTargeter object. I.e. the - * InstructionTargeter has to be notified that (one of) the InstructionHandle it - * is referencing is being removed from the InstructionList and thus not valid anymore. - * - *

Making this an exception instead of a return value forces the user to handle - * these case explicitely in a try { ... } catch. The following code illustrates - * how this may be done:

- * - * 
- *     ...
- *     try {
- *         il.delete(start_ih, end_ih);
- *     } catch(TargetLostException e) {
- *         for (InstructionHandle target : e.getTargets()) {
- *             for (InstructionTargeter targeter : target.getTargeters()) {
- *                 targeter.updateTarget(target, new_target);
- *             }
- *         }
- *     }
- *
- * - * @see InstructionHandle - * @see InstructionList - * @see InstructionTargeter - */ -public final class TargetLostException extends Exception { - - private static final long serialVersionUID = -6857272667645328384L; - private final InstructionHandle[] targets; - - - TargetLostException(final InstructionHandle[] t, final String mesg) { - super(mesg); - targets = t; - } - - - /** - * @return list of instructions still being targeted. - */ - public InstructionHandle[] getTargets() { - return targets; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/Type.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/Type.java deleted file mode 100644 index 93fb6329..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/Type.java +++ /dev/null @@ -1,404 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.bcel.Const; -import org.apache.bcel.classfile.ClassFormatException; -import org.apache.bcel.classfile.Utility; - -/** - * Abstract super class for all possible java types, namely basic types - * such as int, object types like String and array types, e.g. int[] - * - */ -public abstract class Type { - - /** - * @deprecated (since 6.0) will be made private; do not access directly, use getter/setter - */ - @Deprecated - protected byte type; // TODO should be final (and private) - - /** - * @deprecated (since 6.0) will be made private; do not access directly, use getter/setter - */ - @Deprecated - protected String signature; // signature for the type TODO should be private - /** Predefined constants - */ - public static final BasicType VOID = new BasicType(Const.T_VOID); - public static final BasicType BOOLEAN = new BasicType(Const.T_BOOLEAN); - public static final BasicType INT = new BasicType(Const.T_INT); - public static final BasicType SHORT = new BasicType(Const.T_SHORT); - public static final BasicType BYTE = new BasicType(Const.T_BYTE); - public static final BasicType LONG = new BasicType(Const.T_LONG); - public static final BasicType DOUBLE = new BasicType(Const.T_DOUBLE); - public static final BasicType FLOAT = new BasicType(Const.T_FLOAT); - public static final BasicType CHAR = new BasicType(Const.T_CHAR); - public static final ObjectType OBJECT = new ObjectType("java.lang.Object"); - public static final ObjectType CLASS = new ObjectType("java.lang.Class"); - public static final ObjectType STRING = new ObjectType("java.lang.String"); - public static final ObjectType STRINGBUFFER = new ObjectType("java.lang.StringBuffer"); - public static final ObjectType THROWABLE = new ObjectType("java.lang.Throwable"); - public static final Type[] NO_ARGS = new Type[0]; // EMPTY, so immutable - public static final ReferenceType NULL = new ReferenceType() { - }; - public static final Type UNKNOWN = new Type(Const.T_UNKNOWN, "") { - }; - - - protected Type(final byte t, final String s) { - type = t; - signature = s; - } - - - /** - * @return hashcode of Type - */ - @Override - public int hashCode() { - return type ^ signature.hashCode(); - } - - - /** - * @return whether the Types are equal - */ - @Override - public boolean equals(final Object o) { - if (o instanceof Type) { - final Type t = (Type)o; - return (type == t.type) && signature.equals(t.signature); - } - return false; - } - - - /** - * @return signature for given type. - */ - public String getSignature() { - return signature; - } - - - /** - * @return type as defined in Constants - */ - public byte getType() { - return type; - } - - /** - * boolean, short and char variable are considered as int in the stack or local variable area. - * Returns {@link Type#INT} for {@link Type#BOOLEAN}, {@link Type#SHORT} or {@link Type#CHAR}, otherwise - * returns the given type. - * @since 6.0 - */ - public Type normalizeForStackOrLocal() { - if (this == Type.BOOLEAN || this == Type.BYTE || this == Type.SHORT || this == Type.CHAR) { - return Type.INT; - } - return this; - } - - /** - * @return stack size of this type (2 for long and double, 0 for void, 1 otherwise) - */ - public int getSize() { - switch (type) { - case Const.T_DOUBLE: - case Const.T_LONG: - return 2; - case Const.T_VOID: - return 0; - default: - return 1; - } - } - - - /** - * @return Type string, e.g. `int[]' - */ - @Override - public String toString() { - return ((this.equals(Type.NULL) || (type >= Const.T_UNKNOWN))) ? signature : Utility - .signatureToString(signature, false); - } - - - /** - * Convert type to Java method signature, e.g. int[] f(java.lang.String x) - * becomes (Ljava/lang/String;)[I - * - * @param return_type what the method returns - * @param arg_types what are the argument types - * @return method signature for given type(s). - */ - public static String getMethodSignature( final Type return_type, final Type[] arg_types ) { - final StringBuilder buf = new StringBuilder("("); - if (arg_types != null) { - for (final Type arg_type : arg_types) { - buf.append(arg_type.getSignature()); - } - } - buf.append(')'); - buf.append(return_type.getSignature()); - return buf.toString(); - } - - private static final ThreadLocal consumed_chars = new ThreadLocal() { - - @Override - protected Integer initialValue() { - return Integer.valueOf(0); - } - };//int consumed_chars=0; // Remember position in string, see getArgumentTypes - - - private static int unwrap( final ThreadLocal tl ) { - return tl.get().intValue(); - } - - - private static void wrap( final ThreadLocal tl, final int value ) { - tl.set(Integer.valueOf(value)); - } - - - /** - * Convert signature to a Type object. - * @param signature signature string such as Ljava/lang/String; - * @return type object - */ - // @since 6.0 no longer final - public static Type getType( final String signature ) throws StringIndexOutOfBoundsException { - final byte type = Utility.typeOfSignature(signature); - if (type <= Const.T_VOID) { - //corrected concurrent private static field acess - wrap(consumed_chars, 1); - return BasicType.getType(type); - } else if (type == Const.T_ARRAY) { - int dim = 0; - do { // Count dimensions - dim++; - } while (signature.charAt(dim) == '['); - // Recurse, but just once, if the signature is ok - final Type t = getType(signature.substring(dim)); - //corrected concurrent private static field acess - // consumed_chars += dim; // update counter - is replaced by - final int _temp = unwrap(consumed_chars) + dim; - wrap(consumed_chars, _temp); - return new ArrayType(t, dim); - } else { // type == T_REFERENCE - // Utility.typeSignatureToString understands how to parse generic types. - final String parsedSignature = Utility.typeSignatureToString(signature, false); - wrap(consumed_chars, parsedSignature.length() + 2); // "Lblabla;" `L' and `;' are removed - return ObjectType.getInstance(parsedSignature.replace('/', '.')); - } - } - - - /** - * Convert return value of a method (signature) to a Type object. - * - * @param signature signature string such as (Ljava/lang/String;)V - * @return return type - */ - public static Type getReturnType( final String signature ) { - try { - // Read return type after `)' - final int index = signature.lastIndexOf(')') + 1; - return getType(signature.substring(index)); - } catch (final StringIndexOutOfBoundsException e) { // Should never occur - throw new ClassFormatException("Invalid method signature: " + signature, e); - } - } - - - /** - * Convert arguments of a method (signature) to an array of Type objects. - * @param signature signature string such as (Ljava/lang/String;)V - * @return array of argument types - */ - public static Type[] getArgumentTypes( final String signature ) { - final List vec = new ArrayList<>(); - int index; - Type[] types; - try { - // Skip any type arguments to read argument declarations between `(' and `)' - index = signature.indexOf('(') + 1; - if (index <= 0) { - throw new ClassFormatException("Invalid method signature: " + signature); - } - while (signature.charAt(index) != ')') { - vec.add(getType(signature.substring(index))); - //corrected concurrent private static field acess - index += unwrap(consumed_chars); // update position - } - } catch (final StringIndexOutOfBoundsException e) { // Should never occur - throw new ClassFormatException("Invalid method signature: " + signature, e); - } - types = new Type[vec.size()]; - vec.toArray(types); - return types; - } - - - /** Convert runtime java.lang.Class to BCEL Type object. - * @param cl Java class - * @return corresponding Type object - */ - public static Type getType( final java.lang.Class cl ) { - if (cl == null) { - throw new IllegalArgumentException("Class must not be null"); - } - /* That's an amzingly easy case, because getName() returns - * the signature. That's what we would have liked anyway. - */ - if (cl.isArray()) { - return getType(cl.getName()); - } else if (cl.isPrimitive()) { - if (cl == Integer.TYPE) { - return INT; - } else if (cl == Void.TYPE) { - return VOID; - } else if (cl == Double.TYPE) { - return DOUBLE; - } else if (cl == Float.TYPE) { - return FLOAT; - } else if (cl == Boolean.TYPE) { - return BOOLEAN; - } else if (cl == Byte.TYPE) { - return BYTE; - } else if (cl == Short.TYPE) { - return SHORT; - } else if (cl == Byte.TYPE) { - return BYTE; - } else if (cl == Long.TYPE) { - return LONG; - } else if (cl == Character.TYPE) { - return CHAR; - } else { - throw new IllegalStateException("Unknown primitive type " + cl); - } - } else { // "Real" class - return ObjectType.getInstance(cl.getName()); - } - } - - - /** - * Convert runtime java.lang.Class[] to BCEL Type objects. - * @param classes an array of runtime class objects - * @return array of corresponding Type objects - */ - public static Type[] getTypes( final java.lang.Class[] classes ) { - final Type[] ret = new Type[classes.length]; - for (int i = 0; i < ret.length; i++) { - ret[i] = getType(classes[i]); - } - return ret; - } - - - public static String getSignature( final java.lang.reflect.Method meth ) { - final StringBuilder sb = new StringBuilder("("); - final Class[] params = meth.getParameterTypes(); // avoid clone - for (final Class param : params) { - sb.append(getType(param).getSignature()); - } - sb.append(")"); - sb.append(getType(meth.getReturnType()).getSignature()); - return sb.toString(); - } - - static int size(final int coded) { - return coded & 3; - } - - static int consumed(final int coded) { - return coded >> 2; - } - - static int encode(final int size, final int consumed) { - return consumed << 2 | size; - } - - static int getArgumentTypesSize( final String signature ) { - int res = 0; - int index; - try { - // Skip any type arguments to read argument declarations between `(' and `)' - index = signature.indexOf('(') + 1; - if (index <= 0) { - throw new ClassFormatException("Invalid method signature: " + signature); - } - while (signature.charAt(index) != ')') { - final int coded = getTypeSize(signature.substring(index)); - res += size(coded); - index += consumed(coded); - } - } catch (final StringIndexOutOfBoundsException e) { // Should never occur - throw new ClassFormatException("Invalid method signature: " + signature, e); - } - return res; - } - - static int getTypeSize( final String signature ) throws StringIndexOutOfBoundsException { - final byte type = Utility.typeOfSignature(signature); - if (type <= Const.T_VOID) { - return encode(BasicType.getType(type).getSize(), 1); - } else if (type == Const.T_ARRAY) { - int dim = 0; - do { // Count dimensions - dim++; - } while (signature.charAt(dim) == '['); - // Recurse, but just once, if the signature is ok - final int consumed = consumed(getTypeSize(signature.substring(dim))); - return encode(1, dim + consumed); - } else { // type == T_REFERENCE - final int index = signature.indexOf(';'); // Look for closing `;' - if (index < 0) { - throw new ClassFormatException("Invalid signature: " + signature); - } - return encode(1, index + 1); - } - } - - - static int getReturnTypeSize(final String signature) { - final int index = signature.lastIndexOf(')') + 1; - return Type.size(getTypeSize(signature.substring(index))); - } - - - /* - * Currently only used by the ArrayType constructor. - * The signature has a complicated dependency on other parameter - * so it's tricky to do it in a call to the super ctor. - */ - void setSignature(final String signature) { - this.signature = signature; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/TypedInstruction.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/TypedInstruction.java deleted file mode 100644 index 88d0ca01..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/TypedInstruction.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * Get the type associated with an instruction, int for ILOAD, or the type - * of the field of a PUTFIELD instruction, e.g.. - * - */ -public interface TypedInstruction { - - Type getType( ConstantPoolGen cpg ); -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/UnconditionalBranch.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/UnconditionalBranch.java deleted file mode 100644 index 99c40502..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/UnconditionalBranch.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * Denotes an instruction to perform an unconditional branch, i.e., GOTO, JSR. - * - - * @see GOTO - * @see JSR - */ -public interface UnconditionalBranch { -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/VariableLengthInstruction.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/VariableLengthInstruction.java deleted file mode 100644 index a3e497cd..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/VariableLengthInstruction.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * Denotes an instruction to be a variable length instruction, such as - * GOTO, JSR, LOOKUPSWITCH and TABLESWITCH. - * - - * @see GOTO - * @see JSR - * @see LOOKUPSWITCH - * @see TABLESWITCH - */ -public interface VariableLengthInstruction { -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/Visitor.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/Visitor.java deleted file mode 100644 index 66afa1d3..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/Visitor.java +++ /dev/null @@ -1,573 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.generic; - -/** - * Interface implementing the Visitor pattern programming style. - * I.e., a class that implements this interface can handle all types of - * instructions with the properly typed methods just by calling the accept() - * method. - * - */ -public interface Visitor { - - void visitStackInstruction( StackInstruction obj ); - - - void visitLocalVariableInstruction( LocalVariableInstruction obj ); - - - void visitBranchInstruction( BranchInstruction obj ); - - - void visitLoadClass( LoadClass obj ); - - - void visitFieldInstruction( FieldInstruction obj ); - - - void visitIfInstruction( IfInstruction obj ); - - - void visitConversionInstruction( ConversionInstruction obj ); - - - void visitPopInstruction( PopInstruction obj ); - - - void visitStoreInstruction( StoreInstruction obj ); - - - void visitTypedInstruction( TypedInstruction obj ); - - - void visitSelect( Select obj ); - - - void visitJsrInstruction( JsrInstruction obj ); - - - void visitGotoInstruction( GotoInstruction obj ); - - - void visitUnconditionalBranch( UnconditionalBranch obj ); - - - void visitPushInstruction( PushInstruction obj ); - - - void visitArithmeticInstruction( ArithmeticInstruction obj ); - - - void visitCPInstruction( CPInstruction obj ); - - - void visitInvokeInstruction( InvokeInstruction obj ); - - - void visitArrayInstruction( ArrayInstruction obj ); - - - void visitAllocationInstruction( AllocationInstruction obj ); - - - void visitReturnInstruction( ReturnInstruction obj ); - - - void visitFieldOrMethod( FieldOrMethod obj ); - - - void visitConstantPushInstruction( ConstantPushInstruction obj ); - - - void visitExceptionThrower( ExceptionThrower obj ); - - - void visitLoadInstruction( LoadInstruction obj ); - - - void visitVariableLengthInstruction( VariableLengthInstruction obj ); - - - void visitStackProducer( StackProducer obj ); - - - void visitStackConsumer( StackConsumer obj ); - - - void visitACONST_NULL( ACONST_NULL obj ); - - - void visitGETSTATIC( GETSTATIC obj ); - - - void visitIF_ICMPLT( IF_ICMPLT obj ); - - - void visitMONITOREXIT( MONITOREXIT obj ); - - - void visitIFLT( IFLT obj ); - - - void visitLSTORE( LSTORE obj ); - - - void visitPOP2( POP2 obj ); - - - void visitBASTORE( BASTORE obj ); - - - void visitISTORE( ISTORE obj ); - - - void visitCHECKCAST( CHECKCAST obj ); - - - void visitFCMPG( FCMPG obj ); - - - void visitI2F( I2F obj ); - - - void visitATHROW( ATHROW obj ); - - - void visitDCMPL( DCMPL obj ); - - - void visitARRAYLENGTH( ARRAYLENGTH obj ); - - - void visitDUP( DUP obj ); - - - void visitINVOKESTATIC( INVOKESTATIC obj ); - - - void visitLCONST( LCONST obj ); - - - void visitDREM( DREM obj ); - - - void visitIFGE( IFGE obj ); - - - void visitCALOAD( CALOAD obj ); - - - void visitLASTORE( LASTORE obj ); - - - void visitI2D( I2D obj ); - - - void visitDADD( DADD obj ); - - - void visitINVOKESPECIAL( INVOKESPECIAL obj ); - - - void visitIAND( IAND obj ); - - - void visitPUTFIELD( PUTFIELD obj ); - - - void visitILOAD( ILOAD obj ); - - - void visitDLOAD( DLOAD obj ); - - - void visitDCONST( DCONST obj ); - - - void visitNEW( NEW obj ); - - - void visitIFNULL( IFNULL obj ); - - - void visitLSUB( LSUB obj ); - - - void visitL2I( L2I obj ); - - - void visitISHR( ISHR obj ); - - - void visitTABLESWITCH( TABLESWITCH obj ); - - - void visitIINC( IINC obj ); - - - void visitDRETURN( DRETURN obj ); - - - void visitFSTORE( FSTORE obj ); - - - void visitDASTORE( DASTORE obj ); - - - void visitIALOAD( IALOAD obj ); - - - void visitDDIV( DDIV obj ); - - - void visitIF_ICMPGE( IF_ICMPGE obj ); - - - void visitLAND( LAND obj ); - - - void visitIDIV( IDIV obj ); - - - void visitLOR( LOR obj ); - - - void visitCASTORE( CASTORE obj ); - - - void visitFREM( FREM obj ); - - - void visitLDC( LDC obj ); - - - void visitBIPUSH( BIPUSH obj ); - - - void visitDSTORE( DSTORE obj ); - - - void visitF2L( F2L obj ); - - - void visitFMUL( FMUL obj ); - - - void visitLLOAD( LLOAD obj ); - - - void visitJSR( JSR obj ); - - - void visitFSUB( FSUB obj ); - - - void visitSASTORE( SASTORE obj ); - - - void visitALOAD( ALOAD obj ); - - - void visitDUP2_X2( DUP2_X2 obj ); - - - void visitRETURN( RETURN obj ); - - - void visitDALOAD( DALOAD obj ); - - - void visitSIPUSH( SIPUSH obj ); - - - void visitDSUB( DSUB obj ); - - - void visitL2F( L2F obj ); - - - void visitIF_ICMPGT( IF_ICMPGT obj ); - - - void visitF2D( F2D obj ); - - - void visitI2L( I2L obj ); - - - void visitIF_ACMPNE( IF_ACMPNE obj ); - - - void visitPOP( POP obj ); - - - void visitI2S( I2S obj ); - - - void visitIFEQ( IFEQ obj ); - - - void visitSWAP( SWAP obj ); - - - void visitIOR( IOR obj ); - - - void visitIREM( IREM obj ); - - - void visitIASTORE( IASTORE obj ); - - - void visitNEWARRAY( NEWARRAY obj ); - - - void visitINVOKEINTERFACE( INVOKEINTERFACE obj ); - - - void visitINEG( INEG obj ); - - - void visitLCMP( LCMP obj ); - - - void visitJSR_W( JSR_W obj ); - - - void visitMULTIANEWARRAY( MULTIANEWARRAY obj ); - - - void visitDUP_X2( DUP_X2 obj ); - - - void visitSALOAD( SALOAD obj ); - - - void visitIFNONNULL( IFNONNULL obj ); - - - void visitDMUL( DMUL obj ); - - - void visitIFNE( IFNE obj ); - - - void visitIF_ICMPLE( IF_ICMPLE obj ); - - - void visitLDC2_W( LDC2_W obj ); - - - void visitGETFIELD( GETFIELD obj ); - - - void visitLADD( LADD obj ); - - - void visitNOP( NOP obj ); - - - void visitFALOAD( FALOAD obj ); - - - void visitINSTANCEOF( INSTANCEOF obj ); - - - void visitIFLE( IFLE obj ); - - - void visitLXOR( LXOR obj ); - - - void visitLRETURN( LRETURN obj ); - - - void visitFCONST( FCONST obj ); - - - void visitIUSHR( IUSHR obj ); - - - void visitBALOAD( BALOAD obj ); - - - void visitDUP2( DUP2 obj ); - - - void visitIF_ACMPEQ( IF_ACMPEQ obj ); - - - void visitIMPDEP1( IMPDEP1 obj ); - - - void visitMONITORENTER( MONITORENTER obj ); - - - void visitLSHL( LSHL obj ); - - - void visitDCMPG( DCMPG obj ); - - - void visitD2L( D2L obj ); - - - void visitIMPDEP2( IMPDEP2 obj ); - - - void visitL2D( L2D obj ); - - - void visitRET( RET obj ); - - - void visitIFGT( IFGT obj ); - - - void visitIXOR( IXOR obj ); - - - void visitINVOKEVIRTUAL( INVOKEVIRTUAL obj ); - - - /** - * @since 6.0 - */ - void visitINVOKEDYNAMIC( INVOKEDYNAMIC obj ); - - - void visitFASTORE( FASTORE obj ); - - - void visitIRETURN( IRETURN obj ); - - - void visitIF_ICMPNE( IF_ICMPNE obj ); - - - void visitFLOAD( FLOAD obj ); - - - void visitLDIV( LDIV obj ); - - - void visitPUTSTATIC( PUTSTATIC obj ); - - - void visitAALOAD( AALOAD obj ); - - - void visitD2I( D2I obj ); - - - void visitIF_ICMPEQ( IF_ICMPEQ obj ); - - - void visitAASTORE( AASTORE obj ); - - - void visitARETURN( ARETURN obj ); - - - void visitDUP2_X1( DUP2_X1 obj ); - - - void visitFNEG( FNEG obj ); - - - void visitGOTO_W( GOTO_W obj ); - - - void visitD2F( D2F obj ); - - - void visitGOTO( GOTO obj ); - - - void visitISUB( ISUB obj ); - - - void visitF2I( F2I obj ); - - - void visitDNEG( DNEG obj ); - - - void visitICONST( ICONST obj ); - - - void visitFDIV( FDIV obj ); - - - void visitI2B( I2B obj ); - - - void visitLNEG( LNEG obj ); - - - void visitLREM( LREM obj ); - - - void visitIMUL( IMUL obj ); - - - void visitIADD( IADD obj ); - - - void visitLSHR( LSHR obj ); - - - void visitLOOKUPSWITCH( LOOKUPSWITCH obj ); - - - void visitDUP_X1( DUP_X1 obj ); - - - void visitFCMPL( FCMPL obj ); - - - void visitI2C( I2C obj ); - - - void visitLMUL( LMUL obj ); - - - void visitLUSHR( LUSHR obj ); - - - void visitISHL( ISHL obj ); - - - void visitLALOAD( LALOAD obj ); - - - void visitASTORE( ASTORE obj ); - - - void visitANEWARRAY( ANEWARRAY obj ); - - - void visitFRETURN( FRETURN obj ); - - - void visitFADD( FADD obj ); - - - void visitBREAKPOINT( BREAKPOINT obj ); -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/package.html b/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/package.html deleted file mode 100644 index 4138229c..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/generic/package.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - -

-This package contains the "generic" part of the -Byte Code Engineering -Library, i.e., classes to dynamically modify class objects and -byte code instructions. -

- - diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/package.html b/bundles/jamopp.parser.bcel/src/org/apache/bcel/package.html deleted file mode 100644 index 3deb1a36..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/package.html +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - -

-This package contains basic classes for the -Byte Code Engineering Library - and constants defined by the - - JVM specification. -

- - diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/AbstractClassPathRepository.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/AbstractClassPathRepository.java deleted file mode 100644 index 1daf87f6..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/AbstractClassPathRepository.java +++ /dev/null @@ -1,138 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.util; - -import org.apache.bcel.classfile.ClassParser; -import org.apache.bcel.classfile.JavaClass; - -import java.io.IOException; -import java.io.InputStream; - -/** - * This abstract class provides a logic of a loading {@link JavaClass} objects class names via {@link ClassPath}. - * - *

Subclasses can choose caching strategy of the objects by implementing the abstract methods (e.g., {@link - * #storeClass(JavaClass)} and {@link #findClass(String)}).

- * - * @since 6.4.0 - */ -abstract class AbstractClassPathRepository implements Repository { - - private final ClassPath _path; - - AbstractClassPathRepository(final ClassPath classPath) { - _path = classPath; - } - - @Override - public abstract void storeClass(final JavaClass javaClass); - - @Override - public abstract void removeClass(final JavaClass javaClass); - - @Override - public abstract JavaClass findClass(final String className); - - @Override - public abstract void clear(); - - /** - * Finds a JavaClass object by name. If it is already in this Repository, the Repository version is returned. - * Otherwise, the Repository's classpath is searched for the class (and it is added to the Repository if found). - * - * @param className - * the name of the class - * @return the JavaClass object - * @throws ClassNotFoundException - * if the class is not in the Repository, and could not be found on the classpath - */ - @Override - public JavaClass loadClass(String className) throws ClassNotFoundException { - if (className == null || className.isEmpty()) { - throw new IllegalArgumentException("Invalid class name " + className); - } - className = className.replace('/', '.'); // Just in case, canonical form - final JavaClass clazz = findClass(className); - if (clazz != null) { - return clazz; - } - try { - return loadClass(_path.getInputStream(className), className); - } catch (final IOException e) { - throw new ClassNotFoundException("Exception while looking for class " + className + ": " + e, e); - } - } - - /** - * Finds the JavaClass object for a runtime Class object. If a class with the same name is already in this - * Repository, the Repository version is returned. Otherwise, getResourceAsStream() is called on the Class object to - * find the class's representation. If the representation is found, it is added to the Repository. - * - * @see Class - * @param clazz the runtime Class object - * @return JavaClass object for given runtime class - * @throws ClassNotFoundException - * if the class is not in the Repository, and its representation could not be found - */ - @Override - public JavaClass loadClass(final Class clazz) throws ClassNotFoundException { - final String className = clazz.getName(); - final JavaClass repositoryClass = findClass(className); - if (repositoryClass != null) { - return repositoryClass; - } - String name = className; - final int i = name.lastIndexOf('.'); - if (i > 0) { - name = name.substring(i + 1); - } - - try (InputStream clsStream = clazz.getResourceAsStream(name + ".class")) { - return loadClass(clsStream, className); - } catch (final IOException e) { - return null; - } - } - - private JavaClass loadClass(final InputStream inputStream, final String className) throws ClassNotFoundException { - try { - if (inputStream != null) { - final ClassParser parser = new ClassParser(inputStream, className); - final JavaClass clazz = parser.parse(); - storeClass(clazz); - return clazz; - } - } catch (final IOException e) { - throw new ClassNotFoundException("Exception while looking for class " + className + ": " + e, e); - } finally { - if (inputStream != null) { - try { - inputStream.close(); - } catch (final IOException e) { - // ignored - } - } - } - throw new ClassNotFoundException("ClassRepository could not load " + className); - } - - @Override - public ClassPath getClassPath() { - return _path; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/AttributeHTML.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/AttributeHTML.java deleted file mode 100644 index dfe5c8d6..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/AttributeHTML.java +++ /dev/null @@ -1,212 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.util; - -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.PrintWriter; - -import org.apache.bcel.Const; -import org.apache.bcel.classfile.Attribute; -import org.apache.bcel.classfile.Code; -import org.apache.bcel.classfile.CodeException; -import org.apache.bcel.classfile.ConstantPool; -import org.apache.bcel.classfile.ConstantUtf8; -import org.apache.bcel.classfile.ConstantValue; -import org.apache.bcel.classfile.ExceptionTable; -import org.apache.bcel.classfile.InnerClass; -import org.apache.bcel.classfile.InnerClasses; -import org.apache.bcel.classfile.LineNumber; -import org.apache.bcel.classfile.LineNumberTable; -import org.apache.bcel.classfile.LocalVariable; -import org.apache.bcel.classfile.LocalVariableTable; -import org.apache.bcel.classfile.SourceFile; -import org.apache.bcel.classfile.Utility; - -/** - * Convert found attributes into HTML file. - * - * - */ -final class AttributeHTML { - - private final String class_name; // name of current class - private final PrintWriter file; // file to write to - private int attr_count = 0; - private final ConstantHTML constant_html; - private final ConstantPool constant_pool; - - - AttributeHTML(final String dir, final String class_name, final ConstantPool constant_pool, - final ConstantHTML constant_html) throws IOException { - this.class_name = class_name; - this.constant_pool = constant_pool; - this.constant_html = constant_html; - file = new PrintWriter(new FileOutputStream(dir + class_name + "_attributes.html")); - file.println(""); - } - - - private String codeLink( final int link, final int method_number ) { - return "" + link + ""; - } - - - void close() { - file.println("
"); - file.close(); - } - - - void writeAttribute( final Attribute attribute, final String anchor ) { - writeAttribute(attribute, anchor, 0); - } - - - void writeAttribute( final Attribute attribute, final String anchor, final int method_number ) { - final byte tag = attribute.getTag(); - int index; - if (tag == Const.ATTR_UNKNOWN) { - return; - } - attr_count++; // Increment number of attributes found so far - if (attr_count % 2 == 0) { - file.print(""); - } else { - file.print(""); - } - file.println("

" + attr_count + " " + Const.getAttributeName(tag) - + "

"); - /* Handle different attributes - */ - switch (tag) { - case Const.ATTR_CODE: - final Code c = (Code) attribute; - // Some directly printable values - file.print("
  • Maximum stack size = " + c.getMaxStack() - + "
    • \n
  • Number of local variables = " + c.getMaxLocals() - + "
    • \n
  • Byte code
\n"); - // Get handled exceptions and list them - final CodeException[] ce = c.getExceptionTable(); - final int len = ce.length; - if (len > 0) { - file.print("

Exceptions handled

    "); - for (final CodeException cex : ce) { - final int catch_type = cex.getCatchType(); // Index in constant pool - file.print("
  • "); - if (catch_type != 0) { - file.print(constant_html.referenceConstant(catch_type)); // Create Link to _cp.html - } else { - file.print("Any Exception"); - } - file.print("
    (Ranging from lines " - + codeLink(cex.getStartPC(), method_number) + " to " - + codeLink(cex.getEndPC(), method_number) + ", handled at line " - + codeLink(cex.getHandlerPC(), method_number) + ")
    • "); - } - file.print("
"); - } - break; - case Const.ATTR_CONSTANT_VALUE: - index = ((ConstantValue) attribute).getConstantValueIndex(); - // Reference _cp.html - file.print("\n"); - break; - case Const.ATTR_SOURCE_FILE: - index = ((SourceFile) attribute).getSourceFileIndex(); - // Reference _cp.html - file.print("\n"); - break; - case Const.ATTR_EXCEPTIONS: - // List thrown exceptions - final int[] indices = ((ExceptionTable) attribute).getExceptionIndexTable(); - file.print("\n"); - break; - case Const.ATTR_LINE_NUMBER_TABLE: - final LineNumber[] line_numbers = ((LineNumberTable) attribute).getLineNumberTable(); - // List line number pairs - file.print("

"); - for (int i = 0; i < line_numbers.length; i++) { - file.print("(" + line_numbers[i].getStartPC() + ", " - + line_numbers[i].getLineNumber() + ")"); - if (i < line_numbers.length - 1) { - file.print(", "); // breakable - } - } - break; - case Const.ATTR_LOCAL_VARIABLE_TABLE: - final LocalVariable[] vars = ((LocalVariableTable) attribute).getLocalVariableTable(); - // List name, range and type - file.print("

    "); - for (final LocalVariable var : vars) { - index = var.getSignatureIndex(); - String signature = ((ConstantUtf8) constant_pool.getConstant(index, - Const.CONSTANT_Utf8)).getBytes(); - signature = Utility.signatureToString(signature, false); - final int start = var.getStartPC(); - final int end = start + var.getLength(); - file.println("
  • " + Class2HTML.referenceType(signature) + " " - + var.getName() + " in slot %" + var.getIndex() - + "
    Valid from lines " + "" - + start + " to " + "" + end + "
    • "); - } - file.print("
\n"); - break; - case Const.ATTR_INNER_CLASSES: - final InnerClass[] classes = ((InnerClasses) attribute).getInnerClasses(); - // List inner classes - file.print("
    "); - for (final InnerClass classe : classes) { - String name; - String access; - index = classe.getInnerNameIndex(); - if (index > 0) { - name = ((ConstantUtf8) constant_pool.getConstant(index, Const.CONSTANT_Utf8)) - .getBytes(); - } else { - name = "<anonymous>"; - } - access = Utility.accessToString(classe.getInnerAccessFlags()); - file.print("
  • " + access + " " - + constant_html.referenceConstant(classe.getInnerClassIndex()) - + " in class " - + constant_html.referenceConstant(classe.getOuterClassIndex()) - + " named " + name + "
    • \n"); - } - file.print("
\n"); - break; - default: // Such as Unknown attribute or Deprecated - file.print("

" + attribute); - } - file.println(""); - file.flush(); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/BCELComparator.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/BCELComparator.java deleted file mode 100644 index de0b2a12..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/BCELComparator.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.util; - -/** - * Used for BCEL comparison strategy - * - * @since 5.2 - */ -public interface BCELComparator { - - /** - * Compare two objects and return what THIS.equals(THAT) should return - * - * @param THIS - * @param THAT - * @return true if and only if THIS equals THAT - */ - boolean equals( Object THIS, Object THAT ); - - - /** - * Return hashcode for THIS.hashCode() - * - * @param THIS - * @return hashcode for THIS.hashCode() - */ - int hashCode( Object THIS ); -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/BCELFactory.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/BCELFactory.java deleted file mode 100644 index a9e8ae5d..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/BCELFactory.java +++ /dev/null @@ -1,346 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.util; - -import java.io.PrintWriter; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; - -import org.apache.bcel.Const; -import org.apache.bcel.classfile.Utility; -import org.apache.bcel.generic.AllocationInstruction; -import org.apache.bcel.generic.ArrayInstruction; -import org.apache.bcel.generic.ArrayType; -import org.apache.bcel.generic.BranchHandle; -import org.apache.bcel.generic.BranchInstruction; -import org.apache.bcel.generic.CHECKCAST; -import org.apache.bcel.generic.CPInstruction; -import org.apache.bcel.generic.CodeExceptionGen; -import org.apache.bcel.generic.ConstantPoolGen; -import org.apache.bcel.generic.ConstantPushInstruction; -import org.apache.bcel.generic.EmptyVisitor; -import org.apache.bcel.generic.FieldInstruction; -import org.apache.bcel.generic.IINC; -import org.apache.bcel.generic.INSTANCEOF; -import org.apache.bcel.generic.Instruction; -import org.apache.bcel.generic.InstructionConst; -import org.apache.bcel.generic.InstructionHandle; -import org.apache.bcel.generic.InvokeInstruction; -import org.apache.bcel.generic.LDC; -import org.apache.bcel.generic.LDC2_W; -import org.apache.bcel.generic.LocalVariableInstruction; -import org.apache.bcel.generic.MULTIANEWARRAY; -import org.apache.bcel.generic.MethodGen; -import org.apache.bcel.generic.NEWARRAY; -import org.apache.bcel.generic.ObjectType; -import org.apache.bcel.generic.RET; -import org.apache.bcel.generic.ReturnInstruction; -import org.apache.bcel.generic.Select; -import org.apache.bcel.generic.Type; - -/** - * Factory creates il.append() statements, and sets instruction targets. - * A helper class for BCELifier. - * - * @see BCELifier - */ -class BCELFactory extends EmptyVisitor { - - private static final String CONSTANT_PREFIX = Const.class.getSimpleName()+"."; - private final MethodGen _mg; - private final PrintWriter _out; - private final ConstantPoolGen _cp; - - - BCELFactory(final MethodGen mg, final PrintWriter out) { - _mg = mg; - _cp = mg.getConstantPool(); - _out = out; - } - - private final Map branch_map = new HashMap<>(); - - - public void start() { - if (!_mg.isAbstract() && !_mg.isNative()) { - for (InstructionHandle ih = _mg.getInstructionList().getStart(); ih != null; ih = ih - .getNext()) { - final Instruction i = ih.getInstruction(); - if (i instanceof BranchInstruction) { - branch_map.put(i, ih); // memorize container - } - if (ih.hasTargeters()) { - if (i instanceof BranchInstruction) { - _out.println(" InstructionHandle ih_" + ih.getPosition() + ";"); - } else { - _out.print(" InstructionHandle ih_" + ih.getPosition() + " = "); - } - } else { - _out.print(" "); - } - if (!visitInstruction(i)) { - i.accept(this); - } - } - updateBranchTargets(); - updateExceptionHandlers(); - } - } - - - private boolean visitInstruction( final Instruction i ) { - final short opcode = i.getOpcode(); - if ((InstructionConst.getInstruction(opcode) != null) - && !(i instanceof ConstantPushInstruction) && !(i instanceof ReturnInstruction)) { // Handled below - _out.println("il.append(InstructionConst." - + i.getName().toUpperCase(Locale.ENGLISH) + ");"); - return true; - } - return false; - } - - - @Override - public void visitLocalVariableInstruction( final LocalVariableInstruction i ) { - final short opcode = i.getOpcode(); - final Type type = i.getType(_cp); - if (opcode == Const.IINC) { - _out.println("il.append(new IINC(" + i.getIndex() + ", " + ((IINC) i).getIncrement() - + "));"); - } else { - final String kind = (opcode < Const.ISTORE) ? "Load" : "Store"; - _out.println("il.append(_factory.create" + kind + "(" + BCELifier.printType(type) - + ", " + i.getIndex() + "));"); - } - } - - - @Override - public void visitArrayInstruction( final ArrayInstruction i ) { - final short opcode = i.getOpcode(); - final Type type = i.getType(_cp); - final String kind = (opcode < Const.IASTORE) ? "Load" : "Store"; - _out.println("il.append(_factory.createArray" + kind + "(" + BCELifier.printType(type) - + "));"); - } - - - @Override - public void visitFieldInstruction( final FieldInstruction i ) { - final short opcode = i.getOpcode(); - final String class_name = i.getClassName(_cp); - final String field_name = i.getFieldName(_cp); - final Type type = i.getFieldType(_cp); - _out.println("il.append(_factory.createFieldAccess(\"" + class_name + "\", \"" + field_name - + "\", " + BCELifier.printType(type) + ", " + CONSTANT_PREFIX - + Const.getOpcodeName(opcode).toUpperCase(Locale.ENGLISH) + "));"); - } - - - @Override - public void visitInvokeInstruction( final InvokeInstruction i ) { - final short opcode = i.getOpcode(); - final String class_name = i.getClassName(_cp); - final String method_name = i.getMethodName(_cp); - final Type type = i.getReturnType(_cp); - final Type[] arg_types = i.getArgumentTypes(_cp); - _out.println("il.append(_factory.createInvoke(\"" + class_name + "\", \"" + method_name - + "\", " + BCELifier.printType(type) + ", " - + BCELifier.printArgumentTypes(arg_types) + ", " + CONSTANT_PREFIX - + Const.getOpcodeName(opcode).toUpperCase(Locale.ENGLISH) + "));"); - } - - - @Override - public void visitAllocationInstruction( final AllocationInstruction i ) { - Type type; - if (i instanceof CPInstruction) { - type = ((CPInstruction) i).getType(_cp); - } else { - type = ((NEWARRAY) i).getType(); - } - final short opcode = ((Instruction) i).getOpcode(); - int dim = 1; - switch (opcode) { - case Const.NEW: - _out.println("il.append(_factory.createNew(\"" + ((ObjectType) type).getClassName() - + "\"));"); - break; - case Const.MULTIANEWARRAY: - dim = ((MULTIANEWARRAY) i).getDimensions(); - //$FALL-THROUGH$ - case Const.ANEWARRAY: - case Const.NEWARRAY: - if (type instanceof ArrayType) { - type = ((ArrayType) type).getBasicType(); - } - _out.println("il.append(_factory.createNewArray(" + BCELifier.printType(type) - + ", (short) " + dim + "));"); - break; - default: - throw new IllegalArgumentException("Unhandled opcode: " + opcode); - } - } - - - private void createConstant( final Object value ) { - String embed = value.toString(); - if (value instanceof String) { - embed = '"' + Utility.convertString(embed) + '"'; - } else if (value instanceof Character) { - embed = "(char)0x" + Integer.toHexString(((Character) value).charValue()); - } else if (value instanceof Float) { - embed += "f"; - } else if (value instanceof Long) { - embed += "L"; - } else if (value instanceof ObjectType) { - final ObjectType ot = (ObjectType) value; - embed = "new ObjectType(\""+ot.getClassName()+"\")"; - } - - _out.println("il.append(new PUSH(_cp, " + embed + "));"); - } - - - @Override - public void visitLDC( final LDC i ) { - createConstant(i.getValue(_cp)); - } - - - @Override - public void visitLDC2_W( final LDC2_W i ) { - createConstant(i.getValue(_cp)); - } - - - @Override - public void visitConstantPushInstruction( final ConstantPushInstruction i ) { - createConstant(i.getValue()); - } - - - @Override - public void visitINSTANCEOF( final INSTANCEOF i ) { - final Type type = i.getType(_cp); - _out.println("il.append(new INSTANCEOF(_cp.addClass(" + BCELifier.printType(type) + ")));"); - } - - - @Override - public void visitCHECKCAST( final CHECKCAST i ) { - final Type type = i.getType(_cp); - _out.println("il.append(_factory.createCheckCast(" + BCELifier.printType(type) + "));"); - } - - - @Override - public void visitReturnInstruction( final ReturnInstruction i ) { - final Type type = i.getType(_cp); - _out.println("il.append(_factory.createReturn(" + BCELifier.printType(type) + "));"); - } - - // Memorize BranchInstructions that need an update - private final List branches = new ArrayList<>(); - - - @Override - public void visitBranchInstruction( final BranchInstruction bi ) { - final BranchHandle bh = (BranchHandle) branch_map.get(bi); - final int pos = bh.getPosition(); - final String name = bi.getName() + "_" + pos; - if (bi instanceof Select) { - final Select s = (Select) bi; - branches.add(bi); - final StringBuilder args = new StringBuilder("new int[] { "); - final int[] matchs = s.getMatchs(); - for (int i = 0; i < matchs.length; i++) { - args.append(matchs[i]); - if (i < matchs.length - 1) { - args.append(", "); - } - } - args.append(" }"); - _out.print("Select " + name + " = new " + bi.getName().toUpperCase(Locale.ENGLISH) - + "(" + args + ", new InstructionHandle[] { "); - for (int i = 0; i < matchs.length; i++) { - _out.print("null"); - if (i < matchs.length - 1) { - _out.print(", "); - } - } - _out.println(" }, null);"); - } else { - final int t_pos = bh.getTarget().getPosition(); - String target; - if (pos > t_pos) { - target = "ih_" + t_pos; - } else { - branches.add(bi); - target = "null"; - } - _out.println(" BranchInstruction " + name + " = _factory.createBranchInstruction(" - + CONSTANT_PREFIX + bi.getName().toUpperCase(Locale.ENGLISH) + ", " + target - + ");"); - } - if (bh.hasTargeters()) { - _out.println(" ih_" + pos + " = il.append(" + name + ");"); - } else { - _out.println(" il.append(" + name + ");"); - } - } - - - @Override - public void visitRET( final RET i ) { - _out.println("il.append(new RET(" + i.getIndex() + ")));"); - } - - - private void updateBranchTargets() { - for (final BranchInstruction bi : branches) { - final BranchHandle bh = (BranchHandle) branch_map.get(bi); - final int pos = bh.getPosition(); - final String name = bi.getName() + "_" + pos; - int t_pos = bh.getTarget().getPosition(); - _out.println(" " + name + ".setTarget(ih_" + t_pos + ");"); - if (bi instanceof Select) { - final InstructionHandle[] ihs = ((Select) bi).getTargets(); - for (int j = 0; j < ihs.length; j++) { - t_pos = ihs[j].getPosition(); - _out.println(" " + name + ".setTarget(" + j + ", ih_" + t_pos + ");"); - } - } - } - } - - - private void updateExceptionHandlers() { - final CodeExceptionGen[] handlers = _mg.getExceptionHandlers(); - for (final CodeExceptionGen h : handlers) { - final String type = (h.getCatchType() == null) ? "null" : BCELifier.printType(h - .getCatchType()); - _out.println(" method.addExceptionHandler(" + "ih_" + h.getStartPC().getPosition() - + ", " + "ih_" + h.getEndPC().getPosition() + ", " + "ih_" - + h.getHandlerPC().getPosition() + ", " + type + ");"); - } - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/BCELifier.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/BCELifier.java deleted file mode 100644 index cb34928a..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/BCELifier.java +++ /dev/null @@ -1,302 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.util; - -import java.io.IOException; -import java.io.OutputStream; -import java.io.PrintWriter; -import java.util.Locale; - -import org.apache.bcel.Const; -import org.apache.bcel.Repository; -import org.apache.bcel.classfile.ClassParser; -import org.apache.bcel.classfile.ConstantValue; -import org.apache.bcel.classfile.Field; -import org.apache.bcel.classfile.JavaClass; -import org.apache.bcel.classfile.Method; -import org.apache.bcel.classfile.Utility; -import org.apache.bcel.generic.ArrayType; -import org.apache.bcel.generic.ConstantPoolGen; -import org.apache.bcel.generic.MethodGen; -import org.apache.bcel.generic.Type; - -/** - * This class takes a given JavaClass object and converts it to a - * Java program that creates that very class using BCEL. This - * gives new users of BCEL a useful example showing how things - * are done with BCEL. It does not cover all features of BCEL, - * but tries to mimic hand-written code as close as possible. - * - */ -public class BCELifier extends org.apache.bcel.classfile.EmptyVisitor { - - /** - * Enum corresponding to flag source. - */ - public enum FLAGS { - UNKNOWN, - CLASS, - METHOD, - } - - // The base package name for imports; assumes Const is at the top level - // N.B we use the class so renames will be detected by the compiler/IDE - private static final String BASE_PACKAGE = Const.class.getPackage().getName(); - private static final String CONSTANT_PREFIX = Const.class.getSimpleName()+"."; - - private final JavaClass _clazz; - private final PrintWriter _out; - private final ConstantPoolGen _cp; - - /** @param clazz Java class to "decompile" - * @param out where to output Java program - */ - public BCELifier(final JavaClass clazz, final OutputStream out) { - _clazz = clazz; - _out = new PrintWriter(out); - _cp = new ConstantPoolGen(_clazz.getConstantPool()); - } - - - /** Start Java code generation - */ - public void start() { - visitJavaClass(_clazz); - _out.flush(); - } - - - @Override - public void visitJavaClass( final JavaClass clazz ) { - String class_name = clazz.getClassName(); - final String super_name = clazz.getSuperclassName(); - final String package_name = clazz.getPackageName(); - final String inter = Utility.printArray(clazz.getInterfaceNames(), false, true); - if (!"".equals(package_name)) { - class_name = class_name.substring(package_name.length() + 1); - _out.println("package " + package_name + ";"); - _out.println(); - } - _out.println("import " + BASE_PACKAGE + ".generic.*;"); - _out.println("import " + BASE_PACKAGE + ".classfile.*;"); - _out.println("import " + BASE_PACKAGE + ".*;"); - _out.println("import java.io.*;"); - _out.println(); - _out.println("public class " + class_name + "Creator {"); - _out.println(" private InstructionFactory _factory;"); - _out.println(" private ConstantPoolGen _cp;"); - _out.println(" private ClassGen _cg;"); - _out.println(); - _out.println(" public " + class_name + "Creator() {"); - _out.println(" _cg = new ClassGen(\"" - + (("".equals(package_name)) ? class_name : package_name + "." + class_name) - + "\", \"" + super_name + "\", " + "\"" + clazz.getSourceFileName() + "\", " - + printFlags(clazz.getAccessFlags(), FLAGS.CLASS) + ", " - + "new String[] { " + inter + " });"); - _out.println(" _cg.setMajor(" + clazz.getMajor() +");"); - _out.println(" _cg.setMinor(" + clazz.getMinor() +");"); - _out.println(); - _out.println(" _cp = _cg.getConstantPool();"); - _out.println(" _factory = new InstructionFactory(_cg, _cp);"); - _out.println(" }"); - _out.println(); - printCreate(); - final Field[] fields = clazz.getFields(); - if (fields.length > 0) { - _out.println(" private void createFields() {"); - _out.println(" FieldGen field;"); - for (final Field field : fields) { - field.accept(this); - } - _out.println(" }"); - _out.println(); - } - final Method[] methods = clazz.getMethods(); - for (int i = 0; i < methods.length; i++) { - _out.println(" private void createMethod_" + i + "() {"); - methods[i].accept(this); - _out.println(" }"); - _out.println(); - } - printMain(); - _out.println("}"); - } - - - private void printCreate() { - _out.println(" public void create(OutputStream out) throws IOException {"); - final Field[] fields = _clazz.getFields(); - if (fields.length > 0) { - _out.println(" createFields();"); - } - final Method[] methods = _clazz.getMethods(); - for (int i = 0; i < methods.length; i++) { - _out.println(" createMethod_" + i + "();"); - } - _out.println(" _cg.getJavaClass().dump(out);"); - _out.println(" }"); - _out.println(); - } - - - private void printMain() { - final String class_name = _clazz.getClassName(); - _out.println(" public static void main(String[] args) throws Exception {"); - _out.println(" " + class_name + "Creator creator = new " + class_name + "Creator();"); - _out.println(" creator.create(new FileOutputStream(\"" + class_name + ".class\"));"); - _out.println(" }"); - } - - - @Override - public void visitField( final Field field ) { - _out.println(); - _out.println(" field = new FieldGen(" + printFlags(field.getAccessFlags()) + ", " - + printType(field.getSignature()) + ", \"" + field.getName() + "\", _cp);"); - final ConstantValue cv = field.getConstantValue(); - if (cv != null) { - final String value = cv.toString(); - _out.println(" field.setInitValue(" + value + ")"); - } - _out.println(" _cg.addField(field.getField());"); - } - - - @Override - public void visitMethod( final Method method ) { - final MethodGen mg = new MethodGen(method, _clazz.getClassName(), _cp); - _out.println(" InstructionList il = new InstructionList();"); - _out.println(" MethodGen method = new MethodGen(" - + printFlags(method.getAccessFlags(), FLAGS.METHOD) + ", " - + printType(mg.getReturnType()) + ", " - + printArgumentTypes(mg.getArgumentTypes()) + ", " - + "new String[] { " + Utility.printArray(mg.getArgumentNames(), false, true) - + " }, \"" + method.getName() + "\", \"" + _clazz.getClassName() + "\", il, _cp);"); - _out.println(); - final BCELFactory factory = new BCELFactory(mg, _out); - factory.start(); - _out.println(" method.setMaxStack();"); - _out.println(" method.setMaxLocals();"); - _out.println(" _cg.addMethod(method.getMethod());"); - _out.println(" il.dispose();"); - } - - - static String printFlags( final int flags ) { - return printFlags(flags, FLAGS.UNKNOWN); - } - - /** - * Return a string with the flag settings - * @param flags the flags field to interpret - * @param location the item type - * @return the formatted string - * @since 6.0 made public - */ - public static String printFlags( final int flags, final FLAGS location ) { - if (flags == 0) { - return "0"; - } - final StringBuilder buf = new StringBuilder(); - for (int i = 0, pow = 1; pow <= Const.MAX_ACC_FLAG_I; i++) { - if ((flags & pow) != 0) { - if ((pow == Const.ACC_SYNCHRONIZED) && (location == FLAGS.CLASS)) { - buf.append(CONSTANT_PREFIX+"ACC_SUPER | "); - } else if ((pow == Const.ACC_VOLATILE) && (location == FLAGS.METHOD)) { - buf.append(CONSTANT_PREFIX+"ACC_BRIDGE | "); - } else if ((pow == Const.ACC_TRANSIENT) && (location == FLAGS.METHOD)) { - buf.append(CONSTANT_PREFIX+"ACC_VARARGS | "); - } else { - if (i < Const.ACCESS_NAMES_LENGTH) { - buf.append(CONSTANT_PREFIX+"ACC_").append(Const.getAccessName(i).toUpperCase(Locale.ENGLISH)).append( " | "); - } else { - buf.append(String.format (CONSTANT_PREFIX+"ACC_BIT %x | ", pow)); - } - } - } - pow <<= 1; - } - final String str = buf.toString(); - return str.substring(0, str.length() - 3); - } - - - static String printArgumentTypes( final Type[] arg_types ) { - if (arg_types.length == 0) { - return "Type.NO_ARGS"; - } - final StringBuilder args = new StringBuilder(); - for (int i = 0; i < arg_types.length; i++) { - args.append(printType(arg_types[i])); - if (i < arg_types.length - 1) { - args.append(", "); - } - } - return "new Type[] { " + args.toString() + " }"; - } - - - static String printType( final Type type ) { - return printType(type.getSignature()); - } - - - static String printType( final String signature ) { - final Type type = Type.getType(signature); - final byte t = type.getType(); - if (t <= Const.T_VOID) { - return "Type." + Const.getTypeName(t).toUpperCase(Locale.ENGLISH); - } else if (type.toString().equals("java.lang.String")) { - return "Type.STRING"; - } else if (type.toString().equals("java.lang.Object")) { - return "Type.OBJECT"; - } else if (type.toString().equals("java.lang.StringBuffer")) { - return "Type.STRINGBUFFER"; - } else if (type instanceof ArrayType) { - final ArrayType at = (ArrayType) type; - return "new ArrayType(" + printType(at.getBasicType()) + ", " + at.getDimensions() - + ")"; - } else { - return "new ObjectType(\"" + Utility.signatureToString(signature, false) + "\")"; - } - } - - - /** Default main method - */ - public static void main( final String[] argv ) throws Exception { - if (argv.length != 1) { - System.out.println("Usage: BCELifier classname"); - System.out.println("\tThe class must exist on the classpath"); - return; - } - final JavaClass java_class = getJavaClass(argv[0]); - final BCELifier bcelifier = new BCELifier(java_class, System.out); - bcelifier.start(); - } - - - // Needs to be accessible from unit test code - static JavaClass getJavaClass(final String name) throws ClassNotFoundException, IOException { - JavaClass java_class; - if ((java_class = Repository.lookupClass(name)) == null) { - java_class = new ClassParser(name).parse(); // May throw IOException - } - return java_class; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/ByteSequence.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/ByteSequence.java deleted file mode 100644 index 0a065770..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/ByteSequence.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.util; - -import java.io.ByteArrayInputStream; -import java.io.DataInputStream; - -/** - * Utility class that implements a sequence of bytes which can be read - * via the `readByte()' method. This is used to implement a wrapper for the - * Java byte code stream to gain some more readability. - * - */ -public final class ByteSequence extends DataInputStream { - - private final ByteArrayStream byteStream; - - - public ByteSequence(final byte[] bytes) { - super(new ByteArrayStream(bytes)); - byteStream = (ByteArrayStream) in; - } - - - public int getIndex() { - return byteStream.getPosition(); - } - - - void unreadByte() { - byteStream.unreadByte(); - } - - private static final class ByteArrayStream extends ByteArrayInputStream { - - ByteArrayStream(final byte[] bytes) { - super(bytes); - } - - int getPosition() { - // pos is protected in ByteArrayInputStream - return pos; - } - - void unreadByte() { - if (pos > 0) { - pos--; - } - } - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/Class2HTML.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/Class2HTML.java deleted file mode 100644 index 1a347232..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/Class2HTML.java +++ /dev/null @@ -1,237 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.util; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.PrintWriter; -import java.util.HashSet; -import java.util.Set; - -import org.apache.bcel.Const; -import org.apache.bcel.Constants; -import org.apache.bcel.classfile.Attribute; -import org.apache.bcel.classfile.ClassParser; -import org.apache.bcel.classfile.ConstantPool; -import org.apache.bcel.classfile.JavaClass; -import org.apache.bcel.classfile.Method; -import org.apache.bcel.classfile.Utility; - -/** - * Read class file(s) and convert them into HTML files. - * - * Given a JavaClass object "class" that is in package "package" five files - * will be created in the specified directory. - * - *

    - *
  1. "package"."class".html as the main file which defines the frames for - * the following subfiles. - *
  2. "package"."class"_attributes.html contains all (known) attributes found in the file - *
  3. "package"."class"_cp.html contains the constant pool - *
  4. "package"."class"_code.html contains the byte code - *
  5. "package"."class"_methods.html contains references to all methods and fields of the class - *
- * - * All subfiles reference each other appropriately, e.g. clicking on a - * method in the Method's frame will jump to the appropriate method in - * the Code frame. - * - */ -public class Class2HTML implements Constants { - - private final JavaClass java_class; // current class object - private final String dir; - private static String class_package; // name of package, unclean to make it static, but ... - private static String class_name; // name of current class, dito - private static ConstantPool constant_pool; - private static final Set basic_types = new HashSet<>(); - - static { - basic_types.add("int"); - basic_types.add("short"); - basic_types.add("boolean"); - basic_types.add("void"); - basic_types.add("char"); - basic_types.add("byte"); - basic_types.add("long"); - basic_types.add("double"); - basic_types.add("float"); - } - - /** - * Write contents of the given JavaClass into HTML files. - * - * @param java_class The class to write - * @param dir The directory to put the files in - */ - public Class2HTML(final JavaClass java_class, final String dir) throws IOException { - final Method[] methods = java_class.getMethods(); - this.java_class = java_class; - this.dir = dir; - class_name = java_class.getClassName(); // Remember full name - constant_pool = java_class.getConstantPool(); - // Get package name by tacking off everything after the last `.' - final int index = class_name.lastIndexOf('.'); - if (index > -1) { - class_package = class_name.substring(0, index); - } else { - class_package = ""; // default package - } - final ConstantHTML constant_html = new ConstantHTML(dir, class_name, class_package, methods, - constant_pool); - /* Attributes can't be written in one step, so we just open a file - * which will be written consequently. - */ - final AttributeHTML attribute_html = new AttributeHTML(dir, class_name, constant_pool, - constant_html); - new MethodHTML(dir, class_name, methods, java_class.getFields(), - constant_html, attribute_html); - // Write main file (with frames, yuk) - writeMainHTML(attribute_html); - new CodeHTML(dir, class_name, methods, constant_pool, constant_html); - attribute_html.close(); - } - - - public static void main( final String[] argv ) throws IOException { - final String[] file_name = new String[argv.length]; - int files = 0; - ClassParser parser = null; - JavaClass java_class = null; - String zip_file = null; - final char sep = File.separatorChar; - String dir = "." + sep; // Where to store HTML files - /* Parse command line arguments. - */ - for (int i = 0; i < argv.length; i++) { - if (argv[i].charAt(0) == '-') { // command line switch - if (argv[i].equals("-d")) { // Specify target directory, default '.' - dir = argv[++i]; - if (!dir.endsWith("" + sep)) { - dir = dir + sep; - } - final File store = new File(dir); - if (!store.isDirectory()) { - final boolean created = store.mkdirs(); // Create target directory if necessary - if (!created) { - if (!store.isDirectory()) { - System.out.println("Tried to create the directory " + dir + " but failed"); - } - } - } - } else if (argv[i].equals("-zip")) { - zip_file = argv[++i]; - } else { - System.out.println("Unknown option " + argv[i]); - } - } else { - file_name[files++] = argv[i]; - } - } - if (files == 0) { - System.err.println("Class2HTML: No input files specified."); - } else { // Loop through files ... - for (int i = 0; i < files; i++) { - System.out.print("Processing " + file_name[i] + "..."); - if (zip_file == null) { - parser = new ClassParser(file_name[i]); // Create parser object from file - } else { - parser = new ClassParser(zip_file, file_name[i]); // Create parser object from zip file - } - java_class = parser.parse(); - new Class2HTML(java_class, dir); - System.out.println("Done."); - } - } - } - - - /** - * Utility method that converts a class reference in the constant pool, - * i.e., an index to a string. - */ - static String referenceClass( final int index ) { - String str = constant_pool.getConstantString(index, Const.CONSTANT_Class); - str = Utility.compactClassName(str); - str = Utility.compactClassName(str, class_package + ".", true); - return "" + str - + ""; - } - - - static String referenceType( final String type ) { - String short_type = Utility.compactClassName(type); - short_type = Utility.compactClassName(short_type, class_package + ".", true); - final int index = type.indexOf('['); // Type is an array? - String base_type = type; - if (index > -1) { - base_type = type.substring(0, index); // Tack of the `[' - } - // test for basic type - if (basic_types.contains(base_type)) { - return "" + type + ""; - } - return "" + short_type + ""; - } - - - static String toHTML( final String str ) { - final StringBuilder buf = new StringBuilder(); - for (int i = 0; i < str.length(); i++) { - char ch; - switch (ch = str.charAt(i)) { - case '<': - buf.append("<"); - break; - case '>': - buf.append(">"); - break; - case '\n': - buf.append("\\n"); - break; - case '\r': - buf.append("\\r"); - break; - default: - buf.append(ch); - } - } - return buf.toString(); - } - - - private void writeMainHTML( final AttributeHTML attribute_html ) throws IOException { - try (PrintWriter file = new PrintWriter(new FileOutputStream(dir + class_name + ".html"))) { - file.println("\n" + "Documentation for " + class_name + "" + "\n" - + "\n" + "\n" - + "\n" + "\n" + "\n" - + "\n" + "\n" - + "\n" + ""); - } - final Attribute[] attributes = java_class.getAttributes(); - for (int i = 0; i < attributes.length; i++) { - attribute_html.writeAttribute(attributes[i], "class" + i); - } - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/ClassLoader.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/ClassLoader.java deleted file mode 100644 index f63b43af..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/ClassLoader.java +++ /dev/null @@ -1,192 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.util; - -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.util.Hashtable; - -import org.apache.bcel.Const; -import org.apache.bcel.classfile.ClassParser; -import org.apache.bcel.classfile.ConstantClass; -import org.apache.bcel.classfile.ConstantPool; -import org.apache.bcel.classfile.ConstantUtf8; -import org.apache.bcel.classfile.JavaClass; -import org.apache.bcel.classfile.Utility; - -/** - *

Drop in replacement for the standard class loader of the JVM. You can use it - * in conjunction with the JavaWrapper to dynamically modify/create classes - * as they're requested.

- * - *

This class loader recognizes special requests in a distinct - * format, i.e., when the name of the requested class contains with - * "$$BCEL$$" it calls the createClass() method with that name - * (everything bevor the $$BCEL$$ is considered to be the package - * name. You can subclass the class loader and override that - * method. "Normal" classes class can be modified by overriding the - * modifyClass() method which is called just before defineClass().

- * - *

There may be a number of packages where you have to use the - * default class loader (which may also be faster). You can define the - * set of packages where to use the system class loader in the - * constructor. The default value contains "java.", "sun.", - * "javax."

- * - * @see JavaWrapper - * @see ClassPath - * @deprecated 6.0 Do not use - does not work - */ -@Deprecated -public class ClassLoader extends java.lang.ClassLoader { - - private static final String BCEL_TOKEN = "$$BCEL$$"; - - public static final String[] DEFAULT_IGNORED_PACKAGES = { - "java.", "javax.", "sun." - }; - - private final Hashtable> classes = new Hashtable<>(); - // Hashtable is synchronized thus thread-safe - private final String[] ignored_packages; - private Repository repository = SyntheticRepository.getInstance(); - - - /** Ignored packages are by default ( "java.", "sun.", - * "javax."), i.e. loaded by system class loader - */ - public ClassLoader() { - this(DEFAULT_IGNORED_PACKAGES); - } - - - /** @param deferTo delegate class loader to use for ignored packages - */ - public ClassLoader(final java.lang.ClassLoader deferTo) { - super(deferTo); - this.ignored_packages = DEFAULT_IGNORED_PACKAGES; - this.repository = new ClassLoaderRepository(deferTo); - } - - - /** @param ignored_packages classes contained in these packages will be loaded - * with the system class loader - */ - public ClassLoader(final String[] ignored_packages) { - this.ignored_packages = ignored_packages; - } - - - /** @param ignored_packages classes contained in these packages will be loaded - * with the system class loader - * @param deferTo delegate class loader to use for ignored packages - */ - public ClassLoader(final java.lang.ClassLoader deferTo, final String[] ignored_packages) { - this(ignored_packages); - this.repository = new ClassLoaderRepository(deferTo); - } - - @Override - protected Class loadClass( final String class_name, final boolean resolve ) throws ClassNotFoundException { - Class cl = null; - /* First try: lookup hash table. - */ - if ((cl = classes.get(class_name)) == null) { - /* Second try: Load system class using system class loader. You better - * don't mess around with them. - */ - for (final String ignored_package : ignored_packages) { - if (class_name.startsWith(ignored_package)) { - cl = getParent().loadClass(class_name); - break; - } - } - if (cl == null) { - JavaClass clazz = null; - /* Third try: Special request? - */ - if (class_name.contains(BCEL_TOKEN)) { - clazz = createClass(class_name); - } else { // Fourth try: Load classes via repository - if ((clazz = repository.loadClass(class_name)) != null) { - clazz = modifyClass(clazz); - } else { - throw new ClassNotFoundException(class_name); - } - } - if (clazz != null) { - final byte[] bytes = clazz.getBytes(); - cl = defineClass(class_name, bytes, 0, bytes.length); - } else { - cl = Class.forName(class_name); - } - } - if (resolve) { - resolveClass(cl); - } - } - classes.put(class_name, cl); - return cl; - } - - - /** Override this method if you want to alter a class before it gets actually - * loaded. Does nothing by default. - */ - protected JavaClass modifyClass( final JavaClass clazz ) { - return clazz; - } - - - /** - * Override this method to create you own classes on the fly. The - * name contains the special token $$BCEL$$. Everything before that - * token is considered to be a package name. You can encode your own - * arguments into the subsequent string. You must ensure however not - * to use any "illegal" characters, i.e., characters that may not - * appear in a Java class name too - *

- * The default implementation interprets the string as a encoded compressed - * Java class, unpacks and decodes it with the Utility.decode() method, and - * parses the resulting byte array and returns the resulting JavaClass object. - *

- * - * @param class_name compressed byte code with "$$BCEL$$" in it - */ - protected JavaClass createClass( final String class_name ) { - final int index = class_name.indexOf(BCEL_TOKEN); - final String real_name = class_name.substring(index + BCEL_TOKEN.length()); - JavaClass clazz = null; - try { - final byte[] bytes = Utility.decode(real_name, true); - final ClassParser parser = new ClassParser(new ByteArrayInputStream(bytes), "foo"); - clazz = parser.parse(); - } catch (final IOException e) { - e.printStackTrace(); - return null; - } - // Adapt the class name to the passed value - final ConstantPool cp = clazz.getConstantPool(); - final ConstantClass cl = (ConstantClass) cp.getConstant(clazz.getClassNameIndex(), - Const.CONSTANT_Class); - final ConstantUtf8 name = (ConstantUtf8) cp.getConstant(cl.getNameIndex(), - Const.CONSTANT_Utf8); - name.setBytes(class_name.replace('.', '/')); - return clazz; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/ClassLoaderRepository.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/ClassLoaderRepository.java deleted file mode 100644 index 25531815..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/ClassLoaderRepository.java +++ /dev/null @@ -1,122 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.util; - -import java.io.IOException; -import java.io.InputStream; -import java.util.HashMap; -import java.util.Map; - -import org.apache.bcel.classfile.ClassParser; -import org.apache.bcel.classfile.JavaClass; - -/** - * The repository maintains information about which classes have - * been loaded. - * - * It loads its data from the ClassLoader implementation - * passed into its constructor. - * - * @see org.apache.bcel.Repository - * - */ -public class ClassLoaderRepository implements Repository { - - private final java.lang.ClassLoader loader; - private final Map loadedClasses = new HashMap<>(); // CLASSNAME X JAVACLASS - - - public ClassLoaderRepository(final java.lang.ClassLoader loader) { - this.loader = loader; - } - - - /** - * Store a new JavaClass into this Repository. - */ - @Override - public void storeClass( final JavaClass clazz ) { - loadedClasses.put(clazz.getClassName(), clazz); - clazz.setRepository(this); - } - - - /** - * Remove class from repository - */ - @Override - public void removeClass( final JavaClass clazz ) { - loadedClasses.remove(clazz.getClassName()); - } - - - /** - * Find an already defined JavaClass. - */ - @Override - public JavaClass findClass( final String className ) { - return loadedClasses.containsKey(className) ? loadedClasses.get(className) : null; - } - - - /** - * Lookup a JavaClass object from the Class Name provided. - */ - @Override - public JavaClass loadClass(final String className) throws ClassNotFoundException { - final String classFile = className.replace('.', '/'); - JavaClass RC = findClass(className); - if (RC != null) { - return RC; - } - try (InputStream is = loader.getResourceAsStream(classFile + ".class")) { - if (is == null) { - throw new ClassNotFoundException(className + " not found."); - } - final ClassParser parser = new ClassParser(is, className); - RC = parser.parse(); - storeClass(RC); - return RC; - } catch (final IOException e) { - throw new ClassNotFoundException(className + " not found: " + e, e); - } - } - - - @Override - public JavaClass loadClass( final Class clazz ) throws ClassNotFoundException { - return loadClass(clazz.getName()); - } - - - /** Clear all entries from cache. - */ - @Override - public void clear() { - loadedClasses.clear(); - } - - - /* - * @return null - */ - @Override - public ClassPath getClassPath() { - return null; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/ClassPath.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/ClassPath.java deleted file mode 100644 index 74f27050..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/ClassPath.java +++ /dev/null @@ -1,806 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.util; - -import java.io.Closeable; -import java.io.DataInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FilenameFilter; -import java.io.IOException; -import java.io.InputStream; -import java.net.MalformedURLException; -import java.net.URL; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Enumeration; -import java.util.List; -import java.util.Locale; -import java.util.Objects; -import java.util.StringTokenizer; -import java.util.Vector; -import java.util.zip.ZipEntry; -import java.util.zip.ZipFile; - -/** - * Responsible for loading (class) files from the CLASSPATH. Inspired by sun.tools.ClassPath. - * - */ -public class ClassPath implements Closeable { - - private abstract static class AbstractPathEntry implements Closeable { - - abstract ClassFile getClassFile(String name, String suffix) throws IOException; - - abstract URL getResource(String name); - - abstract InputStream getResourceAsStream(String name); - } - - private abstract static class AbstractZip extends AbstractPathEntry { - - private final ZipFile zipFile; - - AbstractZip(final ZipFile zipFile) { - this.zipFile = Objects.requireNonNull(zipFile, "zipFile"); - } - - @Override - public void close() throws IOException { - if (zipFile != null) { - zipFile.close(); - } - - } - - @Override - ClassFile getClassFile(final String name, final String suffix) throws IOException { - final ZipEntry entry = zipFile.getEntry(toEntryName(name, suffix)); - - if (entry == null) { - return null; - } - - return new ClassFile() { - - @Override - public String getBase() { - return zipFile.getName(); - } - - @Override - public InputStream getInputStream() throws IOException { - return zipFile.getInputStream(entry); - } - - @Override - public String getPath() { - return entry.toString(); - } - - @Override - public long getSize() { - return entry.getSize(); - } - - @Override - public long getTime() { - return entry.getTime(); - } - }; - } - - @Override - URL getResource(final String name) { - final ZipEntry entry = zipFile.getEntry(name); - try { - return entry != null ? new URL("jar:file:" + zipFile.getName() + "!/" + name) : null; - } catch (final MalformedURLException e) { - return null; - } - } - - @Override - InputStream getResourceAsStream(final String name) { - final ZipEntry entry = zipFile.getEntry(name); - try { - return entry != null ? zipFile.getInputStream(entry) : null; - } catch (final IOException e) { - return null; - } - } - - protected abstract String toEntryName(final String name, final String suffix); - - @Override - public String toString() { - return zipFile.getName(); - } - - } - - /** - * Contains information about file/ZIP entry of the Java class. - */ - public interface ClassFile { - - /** - * @return base path of found class, i.e. class is contained relative to that path, which may either denote a - * directory, or zip file - */ - String getBase(); - - /** - * @return input stream for class file. - */ - InputStream getInputStream() throws IOException; - - /** - * @return canonical path to class file. - */ - String getPath(); - - /** - * @return size of class file. - */ - long getSize(); - - /** - * @return modification time of class file. - */ - long getTime(); - } - - private static class Dir extends AbstractPathEntry { - - private final String dir; - - Dir(final String d) { - dir = d; - } - - @Override - public void close() throws IOException { - // Nothing to do - - } - - @Override - ClassFile getClassFile(final String name, final String suffix) throws IOException { - final File file = new File(dir + File.separatorChar + name.replace('.', File.separatorChar) + suffix); - return file.exists() ? new ClassFile() { - - @Override - public String getBase() { - return dir; - } - - @Override - public InputStream getInputStream() throws IOException { - return new FileInputStream(file); - } - - @Override - public String getPath() { - try { - return file.getCanonicalPath(); - } catch (final IOException e) { - return null; - } - } - - @Override - public long getSize() { - return file.length(); - } - - @Override - public long getTime() { - return file.lastModified(); - } - } : null; - } - - @Override - URL getResource(final String name) { - // Resource specification uses '/' whatever the platform - final File file = toFile(name); - try { - return file.exists() ? file.toURI().toURL() : null; - } catch (final MalformedURLException e) { - return null; - } - } - - @Override - InputStream getResourceAsStream(final String name) { - // Resource specification uses '/' whatever the platform - final File file = toFile(name); - try { - return file.exists() ? new FileInputStream(file) : null; - } catch (final IOException e) { - return null; - } - } - - private File toFile(final String name) { - return new File(dir + File.separatorChar + name.replace('/', File.separatorChar)); - } - - @Override - public String toString() { - return dir; - } - } - - private static class Jar extends AbstractZip { - - Jar(final ZipFile zip) { - super(zip); - } - - @Override - protected String toEntryName(final String name, final String suffix) { - return packageToFolder(name) + suffix; - } - - } - - private static class JrtModule extends AbstractPathEntry { - - private final Path modulePath; - - public JrtModule(final Path modulePath) { - this.modulePath = Objects.requireNonNull(modulePath, "modulePath"); - } - - @Override - public void close() throws IOException { - // Nothing to do. - - } - - @Override - ClassFile getClassFile(final String name, final String suffix) throws IOException { - final Path resolved = modulePath.resolve(packageToFolder(name) + suffix); - if (Files.exists(resolved)) { - return new ClassFile() { - - @Override - public String getBase() { - return resolved.getFileName().toString(); - } - - @Override - public InputStream getInputStream() throws IOException { - return Files.newInputStream(resolved); - } - - @Override - public String getPath() { - return resolved.toString(); - } - - @Override - public long getSize() { - try { - return Files.size(resolved); - } catch (final IOException e) { - return 0; - } - } - - @Override - public long getTime() { - try { - return Files.getLastModifiedTime(resolved).toMillis(); - } catch (final IOException e) { - return 0; - } - } - }; - } - return null; - } - - @Override - URL getResource(final String name) { - final Path resovled = modulePath.resolve(name); - try { - return Files.exists(resovled) ? new URL("jrt:" + modulePath + "/" + name) : null; - } catch (final MalformedURLException e) { - return null; - } - } - - @Override - InputStream getResourceAsStream(final String name) { - try { - return Files.newInputStream(modulePath.resolve(name)); - } catch (final IOException e) { - return null; - } - } - - @Override - public String toString() { - return modulePath.toString(); - } - - } - - private static class JrtModules extends AbstractPathEntry { - - private final ModularRuntimeImage modularRuntimeImage; - private final JrtModule[] modules; - - public JrtModules(final String path) throws IOException { - this.modularRuntimeImage = new ModularRuntimeImage(); - final List list = modularRuntimeImage.list(path); - this.modules = new JrtModule[list.size()]; - for (int i = 0; i < modules.length; i++) { - modules[i] = new JrtModule(list.get(i)); - } - } - - @Override - public void close() throws IOException { - if (modules != null) { - // don't use a for each loop to avoid creating an iterator for the GC to collect. - for (JrtModule module : modules) { - module.close(); - } - } - if (modularRuntimeImage != null) { - modularRuntimeImage.close(); - } - } - - @Override - ClassFile getClassFile(final String name, final String suffix) throws IOException { - // don't use a for each loop to avoid creating an iterator for the GC to collect. - for (JrtModule module : modules) { - final ClassFile classFile = module.getClassFile(name, suffix); - if (classFile != null) { - return classFile; - } - } - return null; - } - - @Override - URL getResource(final String name) { - // don't use a for each loop to avoid creating an iterator for the GC to collect. - for (JrtModule module : modules) { - final URL url = module.getResource(name); - if (url != null) { - return url; - } - } - return null; - } - - @Override - InputStream getResourceAsStream(final String name) { - // don't use a for each loop to avoid creating an iterator for the GC to collect. - for (JrtModule module : modules) { - final InputStream inputStream = module.getResourceAsStream(name); - if (inputStream != null) { - return inputStream; - } - } - return null; - } - - @Override - public String toString() { - return Arrays.toString(modules); - } - - } - - private static class Module extends AbstractZip { - - Module(final ZipFile zip) { - super(zip); - } - - @Override - protected String toEntryName(final String name, final String suffix) { - return "classes/" + packageToFolder(name) + suffix; - } - - } - - private static final FilenameFilter ARCHIVE_FILTER = (dir, name) -> { - name = name.toLowerCase(Locale.ENGLISH); - return name.endsWith(".zip") || name.endsWith(".jar"); - }; - - private static final FilenameFilter MODULES_FILTER = (dir, name) -> { - name = name.toLowerCase(Locale.ENGLISH); - return name.endsWith(".jmod"); - }; - - public static final ClassPath SYSTEM_CLASS_PATH = new ClassPath(getClassPath()); - - private static void addJdkModules(final String javaHome, final List list) { - String modulesPath = System.getProperty("java.modules.path"); - if (modulesPath == null || modulesPath.trim().isEmpty()) { - // Default to looking in JAVA_HOME/jmods - modulesPath = javaHome + File.separator + "jmods"; - } - final File modulesDir = new File(modulesPath); - if (modulesDir.exists()) { - final String[] modules = modulesDir.list(MODULES_FILTER); - for (String module : modules) { - list.add(modulesDir.getPath() + File.separatorChar + module); - } - } - } - - /** - * Checks for class path components in the following properties: "java.class.path", "sun.boot.class.path", - * "java.ext.dirs" - * - * @return class path as used by default by BCEL - */ - // @since 6.0 no longer final - public static String getClassPath() { - final String classPathProp = System.getProperty("java.class.path"); - final String bootClassPathProp = System.getProperty("sun.boot.class.path"); - final String extDirs = System.getProperty("java.ext.dirs"); - // System.out.println("java.version = " + System.getProperty("java.version")); - // System.out.println("java.class.path = " + classPathProp); - // System.out.println("sun.boot.class.path=" + bootClassPathProp); - // System.out.println("java.ext.dirs=" + extDirs); - final String javaHome = System.getProperty("java.home"); - final List list = new ArrayList<>(); - - // Starting in JRE 9, .class files are in the modules directory. Add them to the path. - final Path modulesPath = Paths.get(javaHome).resolve("lib/modules"); - if (Files.exists(modulesPath) && Files.isRegularFile(modulesPath)) { - list.add(modulesPath.toAbsolutePath().toString()); - } - // Starting in JDK 9, .class files are in the jmods directory. Add them to the path. - addJdkModules(javaHome, list); - - getPathComponents(classPathProp, list); - getPathComponents(bootClassPathProp, list); - final List dirs = new ArrayList<>(); - getPathComponents(extDirs, dirs); - for (final String d : dirs) { - final File ext_dir = new File(d); - final String[] extensions = ext_dir.list(ARCHIVE_FILTER); - if (extensions != null) { - for (final String extension : extensions) { - list.add(ext_dir.getPath() + File.separatorChar + extension); - } - } - } - - final StringBuilder buf = new StringBuilder(); - String separator = ""; - for (final String path : list) { - buf.append(separator); - separator = File.pathSeparator; - buf.append(path); - } - return buf.toString().intern(); - } - - private static void getPathComponents(final String path, final List list) { - if (path != null) { - final StringTokenizer tokenizer = new StringTokenizer(path, File.pathSeparator); - while (tokenizer.hasMoreTokens()) { - final String name = tokenizer.nextToken(); - final File file = new File(name); - if (file.exists()) { - list.add(name); - } - } - } - } - - static String packageToFolder(final String name) { - return name.replace('.', '/'); - } - - private final String classPath; - - private ClassPath parent; - - private final AbstractPathEntry[] paths; - - /** - * Search for classes in CLASSPATH. - * - * @deprecated Use SYSTEM_CLASS_PATH constant - */ - @Deprecated - public ClassPath() { - this(getClassPath()); - } - - public ClassPath(final ClassPath parent, final String classPath) { - this(classPath); - this.parent = parent; - } - - /** - * Search for classes in given path. - * - * @param classPath - */ - @SuppressWarnings("resource") - public ClassPath(final String classPath) { - this.classPath = classPath; - final List list = new ArrayList<>(); - for (final StringTokenizer tokenizer = new StringTokenizer(classPath, File.pathSeparator); tokenizer - .hasMoreTokens();) { - final String path = tokenizer.nextToken(); - if (!path.isEmpty()) { - final File file = new File(path); - try { - if (file.exists()) { - if (file.isDirectory()) { - list.add(new Dir(path)); - } else if (path.endsWith(".jmod")) { - list.add(new Module(new ZipFile(file))); - } else if (path.endsWith(ModularRuntimeImage.MODULES_PATH)) { - list.add(new JrtModules(ModularRuntimeImage.MODULES_PATH)); - } else { - list.add(new Jar(new ZipFile(file))); - } - } - } catch (final IOException e) { - if (path.endsWith(".zip") || path.endsWith(".jar")) { - System.err.println("CLASSPATH component " + file + ": " + e); - } - } - } - } - paths = new AbstractPathEntry[list.size()]; - list.toArray(paths); - } - - @Override - public void close() throws IOException { - if (paths != null) { - for (final AbstractPathEntry path : paths) { - path.close(); - } - } - - } - - @Override - public boolean equals(final Object o) { - if (o instanceof ClassPath) { - final ClassPath cp = (ClassPath) o; - return classPath.equals(cp.toString()); - } - return false; - } - - /** - * @return byte array for class - */ - public byte[] getBytes(final String name) throws IOException { - return getBytes(name, ".class"); - } - - /** - * @param name - * fully qualified file name, e.g. java/lang/String - * @param suffix - * file name ends with suffix, e.g. .java - * @return byte array for file on class path - */ - public byte[] getBytes(final String name, final String suffix) throws IOException { - DataInputStream dis = null; - try (InputStream inputStream = getInputStream(name, suffix)) { - if (inputStream == null) { - throw new IOException("Couldn't find: " + name + suffix); - } - dis = new DataInputStream(inputStream); - final byte[] bytes = new byte[inputStream.available()]; - dis.readFully(bytes); - return bytes; - } finally { - if (dis != null) { - dis.close(); - } - } - } - - /** - * @param name - * fully qualified class name, e.g. java.lang.String - * @return input stream for class - */ - public ClassFile getClassFile(final String name) throws IOException { - return getClassFile(name, ".class"); - } - - /** - * @param name - * fully qualified file name, e.g. java/lang/String - * @param suffix - * file name ends with suff, e.g. .java - * @return class file for the java class - */ - public ClassFile getClassFile(final String name, final String suffix) throws IOException { - ClassFile cf = null; - - if (parent != null) { - cf = parent.getClassFileInternal(name, suffix); - } - - if (cf == null) { - cf = getClassFileInternal(name, suffix); - } - - if (cf != null) { - return cf; - } - - throw new IOException("Couldn't find: " + name + suffix); - } - - private ClassFile getClassFileInternal(final String name, final String suffix) throws IOException { - - for (final AbstractPathEntry path : paths) { - final ClassFile cf = path.getClassFile(name, suffix); - - if (cf != null) { - return cf; - } - } - - return null; - } - - /** - * @param name - * fully qualified class name, e.g. java.lang.String - * @return input stream for class - */ - public InputStream getInputStream(final String name) throws IOException { - return getInputStream(packageToFolder(name), ".class"); - } - - /** - * Return stream for class or resource on CLASSPATH. - * - * @param name - * fully qualified file name, e.g. java/lang/String - * @param suffix - * file name ends with suff, e.g. .java - * @return input stream for file on class path - */ - public InputStream getInputStream(final String name, final String suffix) throws IOException { - InputStream inputStream = null; - try { - inputStream = getClass().getClassLoader().getResourceAsStream(name + suffix); // may return null - } catch (final Exception e) { - // ignored - } - if (inputStream != null) { - return inputStream; - } - return getClassFile(name, suffix).getInputStream(); - } - - /** - * @param name - * name of file to search for, e.g. java/lang/String.java - * @return full (canonical) path for file - */ - public String getPath(String name) throws IOException { - final int index = name.lastIndexOf('.'); - String suffix = ""; - if (index > 0) { - suffix = name.substring(index); - name = name.substring(0, index); - } - return getPath(name, suffix); - } - - /** - * @param name - * name of file to search for, e.g. java/lang/String - * @param suffix - * file name suffix, e.g. .java - * @return full (canonical) path for file, if it exists - */ - public String getPath(final String name, final String suffix) throws IOException { - return getClassFile(name, suffix).getPath(); - } - - /** - * @param name - * fully qualified resource name, e.g. java/lang/String.class - * @return URL supplying the resource, or null if no resource with that name. - * @since 6.0 - */ - public URL getResource(final String name) { - for (final AbstractPathEntry path : paths) { - URL url; - if ((url = path.getResource(name)) != null) { - return url; - } - } - return null; - } - - /** - * @param name - * fully qualified resource name, e.g. java/lang/String.class - * @return InputStream supplying the resource, or null if no resource with that name. - * @since 6.0 - */ - public InputStream getResourceAsStream(final String name) { - for (final AbstractPathEntry path : paths) { - InputStream is; - if ((is = path.getResourceAsStream(name)) != null) { - return is; - } - } - return null; - } - - /** - * @param name - * fully qualified resource name, e.g. java/lang/String.class - * @return An Enumeration of URLs supplying the resource, or an empty Enumeration if no resource with that name. - * @since 6.0 - */ - public Enumeration getResources(final String name) { - final Vector results = new Vector<>(); - for (final AbstractPathEntry path : paths) { - URL url; - if ((url = path.getResource(name)) != null) { - results.add(url); - } - } - return results.elements(); - } - - @Override - public int hashCode() { - if (parent != null) { - return classPath.hashCode() + parent.hashCode(); - } - return classPath.hashCode(); - } - - /** - * @return used class path string - */ - @Override - public String toString() { - if (parent != null) { - return parent + File.pathSeparator + classPath; - } - return classPath; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/ClassPathRepository.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/ClassPathRepository.java deleted file mode 100644 index b7672924..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/ClassPathRepository.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.util; - -import java.util.HashMap; -import java.util.Map; - -import org.apache.bcel.classfile.JavaClass; - -/** - * This repository is used in situations where a Class is created outside the realm of a ClassLoader. Classes are loaded from the file systems using the paths - * specified in the given class path. By default, this is the value returned by ClassPath.getClassPath(). - * - * @see org.apache.bcel.Repository - */ -public class ClassPathRepository extends AbstractClassPathRepository { - - private final Map _loadedClasses = new HashMap<>(); // CLASSNAME X JAVACLASS - - public ClassPathRepository(final ClassPath classPath) { - super(classPath); - } - - /** - * Stores a new JavaClass instance into this Repository. - */ - @Override - public void storeClass(final JavaClass javaClass) { - _loadedClasses.put(javaClass.getClassName(), javaClass); - javaClass.setRepository(this); - } - - /** - * Removes class from repository. - */ - @Override - public void removeClass(final JavaClass javaClass) { - _loadedClasses.remove(javaClass.getClassName()); - } - - /** - * Finds an already defined (cached) JavaClass object by name. - */ - @Override - public JavaClass findClass(final String className) { - return _loadedClasses.get(className); - } - - /** - * Clears all entries from cache. - */ - @Override - public void clear() { - _loadedClasses.clear(); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/ClassQueue.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/ClassQueue.java deleted file mode 100644 index 9734b44a..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/ClassQueue.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.util; - -import java.util.LinkedList; - -import org.apache.bcel.classfile.JavaClass; - -/** - * Utility class implementing a (typesafe) queue of JavaClass - * objects. - * - */ -public class ClassQueue { - - /** - * @deprecated (since 6.0) will be made private; do not access - */ - @Deprecated - protected LinkedList vec = new LinkedList<>(); // TODO not used externally - - - public void enqueue( final JavaClass clazz ) { - vec.addLast(clazz); - } - - - public JavaClass dequeue() { - return vec.removeFirst(); - } - - - public boolean empty() { - return vec.isEmpty(); - } - - - @Override - public String toString() { - return vec.toString(); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/ClassSet.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/ClassSet.java deleted file mode 100644 index 1ce681a4..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/ClassSet.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.util; - -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; - -import org.apache.bcel.classfile.JavaClass; - -/** - * Utility class implementing a (typesafe) set of JavaClass objects. - * Since JavaClass has no equals() method, the name of the class is - * used for comparison. - * - * @see ClassStack - */ -public class ClassSet { - - private final Map map = new HashMap<>(); - - - public boolean add( final JavaClass clazz ) { - boolean result = false; - if (!map.containsKey(clazz.getClassName())) { - result = true; - map.put(clazz.getClassName(), clazz); - } - return result; - } - - - public void remove( final JavaClass clazz ) { - map.remove(clazz.getClassName()); - } - - - public boolean empty() { - return map.isEmpty(); - } - - - public JavaClass[] toArray() { - final Collection values = map.values(); - final JavaClass[] classes = new JavaClass[values.size()]; - values.toArray(classes); - return classes; - } - - - public String[] getClassNames() { - return map.keySet().toArray(new String[map.size()]); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/ClassStack.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/ClassStack.java deleted file mode 100644 index 1a040564..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/ClassStack.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.util; - -import java.util.Stack; - -import org.apache.bcel.classfile.JavaClass; - -/** - * Utility class implementing a (typesafe) stack of JavaClass objects. - * - * @see Stack - */ -public class ClassStack { - - private final Stack stack = new Stack<>(); - - - public void push( final JavaClass clazz ) { - stack.push(clazz); - } - - - public JavaClass pop() { - return stack.pop(); - } - - - public JavaClass top() { - return stack.peek(); - } - - - public boolean empty() { - return stack.empty(); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/ClassVector.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/ClassVector.java deleted file mode 100644 index 54cb6617..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/ClassVector.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.util; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.bcel.classfile.JavaClass; - -/** - * Utility class implementing a (typesafe) collection of JavaClass - * objects. Contains the most important methods of a Vector. - * - * - * @deprecated as of 5.1.1 - 7/17/2005 - */ -@Deprecated -public class ClassVector implements java.io.Serializable { - - private static final long serialVersionUID = 5600397075672780806L; - @Deprecated - protected List vec = new ArrayList<>(); - - - public void addElement( final JavaClass clazz ) { - vec.add(clazz); - } - - - public JavaClass elementAt( final int index ) { - return vec.get(index); - } - - - public void removeElementAt( final int index ) { - vec.remove(index); - } - - - public JavaClass[] toArray() { - final JavaClass[] classes = new JavaClass[vec.size()]; - vec.toArray(classes); - return classes; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/CodeHTML.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/CodeHTML.java deleted file mode 100644 index 3160492a..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/CodeHTML.java +++ /dev/null @@ -1,582 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.util; - -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.PrintWriter; -import java.util.BitSet; - -import org.apache.bcel.Const; -import org.apache.bcel.classfile.Attribute; -import org.apache.bcel.classfile.Code; -import org.apache.bcel.classfile.CodeException; -import org.apache.bcel.classfile.ConstantFieldref; -import org.apache.bcel.classfile.ConstantInterfaceMethodref; -import org.apache.bcel.classfile.ConstantInvokeDynamic; -import org.apache.bcel.classfile.ConstantMethodref; -import org.apache.bcel.classfile.ConstantNameAndType; -import org.apache.bcel.classfile.ConstantPool; -import org.apache.bcel.classfile.LocalVariable; -import org.apache.bcel.classfile.LocalVariableTable; -import org.apache.bcel.classfile.Method; -import org.apache.bcel.classfile.Utility; - -/** - * Convert code into HTML file. - * - * - */ -final class CodeHTML { - - private final String className; // name of current class -// private Method[] methods; // Methods to print - private final PrintWriter file; // file to write to - private BitSet gotoSet; - private final ConstantPool constantPool; - private final ConstantHTML constantHtml; - private static boolean wide = false; - - - CodeHTML(final String dir, final String class_name, final Method[] methods, final ConstantPool constant_pool, - final ConstantHTML constant_html) throws IOException { - this.className = class_name; -// this.methods = methods; - this.constantPool = constant_pool; - this.constantHtml = constant_html; - file = new PrintWriter(new FileOutputStream(dir + class_name + "_code.html")); - file.println(""); - for (int i = 0; i < methods.length; i++) { - writeMethod(methods[i], i); - } - file.println(""); - file.close(); - } - - - /** - * Disassemble a stream of byte codes and return the - * string representation. - * - * @param stream data input stream - * @return String representation of byte code - */ - private String codeToHTML( final ByteSequence bytes, final int method_number ) throws IOException { - final short opcode = (short) bytes.readUnsignedByte(); - String name; - String signature; - int default_offset = 0; - int low; - int high; - int index; - int class_index; - int vindex; - int constant; - int[] jump_table; - int no_pad_bytes = 0; - int offset; - final StringBuilder buf = new StringBuilder(256); // CHECKSTYLE IGNORE MagicNumber - buf.append("").append(Const.getOpcodeName(opcode)).append(""); - /* Special case: Skip (0-3) padding bytes, i.e., the - * following bytes are 4-byte-aligned - */ - if ((opcode == Const.TABLESWITCH) || (opcode == Const.LOOKUPSWITCH)) { - final int remainder = bytes.getIndex() % 4; - no_pad_bytes = (remainder == 0) ? 0 : 4 - remainder; - for (int i = 0; i < no_pad_bytes; i++) { - bytes.readByte(); - } - // Both cases have a field default_offset in common - default_offset = bytes.readInt(); - } - switch (opcode) { - case Const.TABLESWITCH: - low = bytes.readInt(); - high = bytes.readInt(); - offset = bytes.getIndex() - 12 - no_pad_bytes - 1; - default_offset += offset; - buf.append(""); - // Print switch indices in first row (and default) - jump_table = new int[high - low + 1]; - for (int i = 0; i < jump_table.length; i++) { - jump_table[i] = offset + bytes.readInt(); - buf.append(""); - } - buf.append("\n"); - // Print target and default indices in second row - for (final int element : jump_table) { - buf.append(""); - } - buf.append("\n
").append(low + i).append("default
").append(element).append("").append(default_offset).append( - "
\n"); - break; - /* Lookup switch has variable length arguments. - */ - case Const.LOOKUPSWITCH: - final int npairs = bytes.readInt(); - offset = bytes.getIndex() - 8 - no_pad_bytes - 1; - jump_table = new int[npairs]; - default_offset += offset; - buf.append(""); - // Print switch indices in first row (and default) - for (int i = 0; i < npairs; i++) { - final int match = bytes.readInt(); - jump_table[i] = offset + bytes.readInt(); - buf.append(""); - } - buf.append("\n"); - // Print target and default indices in second row - for (int i = 0; i < npairs; i++) { - buf.append(""); - } - buf.append("\n
").append(match).append("default
").append(jump_table[i]).append("").append(default_offset).append( - "
\n"); - break; - /* Two address bytes + offset from start of byte stream form the - * jump target. - */ - case Const.GOTO: - case Const.IFEQ: - case Const.IFGE: - case Const.IFGT: - case Const.IFLE: - case Const.IFLT: - case Const.IFNE: - case Const.IFNONNULL: - case Const.IFNULL: - case Const.IF_ACMPEQ: - case Const.IF_ACMPNE: - case Const.IF_ICMPEQ: - case Const.IF_ICMPGE: - case Const.IF_ICMPGT: - case Const.IF_ICMPLE: - case Const.IF_ICMPLT: - case Const.IF_ICMPNE: - case Const.JSR: - index = bytes.getIndex() + bytes.readShort() - 1; - buf.append("").append(index).append(""); - break; - /* Same for 32-bit wide jumps - */ - case Const.GOTO_W: - case Const.JSR_W: - final int windex = bytes.getIndex() + bytes.readInt() - 1; - buf.append("").append(windex).append(""); - break; - /* Index byte references local variable (register) - */ - case Const.ALOAD: - case Const.ASTORE: - case Const.DLOAD: - case Const.DSTORE: - case Const.FLOAD: - case Const.FSTORE: - case Const.ILOAD: - case Const.ISTORE: - case Const.LLOAD: - case Const.LSTORE: - case Const.RET: - if (wide) { - vindex = bytes.readShort(); - wide = false; // Clear flag - } else { - vindex = bytes.readUnsignedByte(); - } - buf.append("%").append(vindex); - break; - /* - * Remember wide byte which is used to form a 16-bit address in the - * following instruction. Relies on that the method is called again with - * the following opcode. - */ - case Const.WIDE: - wide = true; - buf.append("(wide)"); - break; - /* Array of basic type. - */ - case Const.NEWARRAY: - buf.append("").append(Const.getTypeName(bytes.readByte())).append( - ""); - break; - /* Access object/class fields. - */ - case Const.GETFIELD: - case Const.GETSTATIC: - case Const.PUTFIELD: - case Const.PUTSTATIC: - index = bytes.readShort(); - final ConstantFieldref c1 = (ConstantFieldref) constantPool.getConstant(index, - Const.CONSTANT_Fieldref); - class_index = c1.getClassIndex(); - name = constantPool.getConstantString(class_index, Const.CONSTANT_Class); - name = Utility.compactClassName(name, false); - index = c1.getNameAndTypeIndex(); - final String field_name = constantPool.constantToString(index, Const.CONSTANT_NameAndType); - if (name.equals(className)) { // Local field - buf.append("").append(field_name) - .append("\n"); - } else { - buf.append(constantHtml.referenceConstant(class_index)).append(".").append( - field_name); - } - break; - /* Operands are references to classes in constant pool - */ - case Const.CHECKCAST: - case Const.INSTANCEOF: - case Const.NEW: - index = bytes.readShort(); - buf.append(constantHtml.referenceConstant(index)); - break; - /* Operands are references to methods in constant pool - */ - case Const.INVOKESPECIAL: - case Const.INVOKESTATIC: - case Const.INVOKEVIRTUAL: - case Const.INVOKEINTERFACE: - case Const.INVOKEDYNAMIC: - final int m_index = bytes.readShort(); - String str; - if (opcode == Const.INVOKEINTERFACE) { // Special treatment needed - bytes.readUnsignedByte(); // Redundant - bytes.readUnsignedByte(); // Reserved -// int nargs = bytes.readUnsignedByte(); // Redundant -// int reserved = bytes.readUnsignedByte(); // Reserved - final ConstantInterfaceMethodref c = (ConstantInterfaceMethodref) constantPool - .getConstant(m_index, Const.CONSTANT_InterfaceMethodref); - class_index = c.getClassIndex(); - index = c.getNameAndTypeIndex(); - name = Class2HTML.referenceClass(class_index); - } else if (opcode == Const.INVOKEDYNAMIC) { // Special treatment needed - bytes.readUnsignedByte(); // Reserved - bytes.readUnsignedByte(); // Reserved - final ConstantInvokeDynamic c = (ConstantInvokeDynamic) constantPool - .getConstant(m_index, Const.CONSTANT_InvokeDynamic); - index = c.getNameAndTypeIndex(); - name = "#" + c.getBootstrapMethodAttrIndex(); - } else { - // UNDONE: Java8 now allows INVOKESPECIAL and INVOKESTATIC to - // reference EITHER a Methodref OR an InterfaceMethodref. - // Not sure if that affects this code or not. (markro) - final ConstantMethodref c = (ConstantMethodref) constantPool.getConstant(m_index, - Const.CONSTANT_Methodref); - class_index = c.getClassIndex(); - index = c.getNameAndTypeIndex(); - name = Class2HTML.referenceClass(class_index); - } - str = Class2HTML.toHTML(constantPool.constantToString(constantPool.getConstant( - index, Const.CONSTANT_NameAndType))); - // Get signature, i.e., types - final ConstantNameAndType c2 = (ConstantNameAndType) constantPool.getConstant(index, - Const.CONSTANT_NameAndType); - signature = constantPool.constantToString(c2.getSignatureIndex(), Const.CONSTANT_Utf8); - final String[] args = Utility.methodSignatureArgumentTypes(signature, false); - final String type = Utility.methodSignatureReturnType(signature, false); - buf.append(name).append(".").append(str).append( - "").append("("); - // List arguments - for (int i = 0; i < args.length; i++) { - buf.append(Class2HTML.referenceType(args[i])); - if (i < args.length - 1) { - buf.append(", "); - } - } - // Attach return type - buf.append("):").append(Class2HTML.referenceType(type)); - break; - /* Operands are references to items in constant pool - */ - case Const.LDC_W: - case Const.LDC2_W: - index = bytes.readShort(); - buf.append("").append( - Class2HTML.toHTML(constantPool.constantToString(index, - constantPool.getConstant(index).getTag()))).append(""); - break; - case Const.LDC: - index = bytes.readUnsignedByte(); - buf.append("").append( - Class2HTML.toHTML(constantPool.constantToString(index, - constantPool.getConstant(index).getTag()))).append(""); - break; - /* Array of references. - */ - case Const.ANEWARRAY: - index = bytes.readShort(); - buf.append(constantHtml.referenceConstant(index)); - break; - /* Multidimensional array of references. - */ - case Const.MULTIANEWARRAY: - index = bytes.readShort(); - final int dimensions = bytes.readByte(); - buf.append(constantHtml.referenceConstant(index)).append(":").append(dimensions) - .append("-dimensional"); - break; - /* Increment local variable. - */ - case Const.IINC: - if (wide) { - vindex = bytes.readShort(); - constant = bytes.readShort(); - wide = false; - } else { - vindex = bytes.readUnsignedByte(); - constant = bytes.readByte(); - } - buf.append("%").append(vindex).append(" ").append(constant); - break; - default: - if (Const.getNoOfOperands(opcode) > 0) { - for (int i = 0; i < Const.getOperandTypeCount(opcode); i++) { - switch (Const.getOperandType(opcode, i)) { - case Const.T_BYTE: - buf.append(bytes.readUnsignedByte()); - break; - case Const.T_SHORT: // Either branch or index - buf.append(bytes.readShort()); - break; - case Const.T_INT: - buf.append(bytes.readInt()); - break; - default: // Never reached - throw new IllegalStateException("Unreachable default case reached! "+Const.getOperandType(opcode, i)); - } - buf.append(" "); - } - } - } - buf.append(""); - return buf.toString(); - } - - - /** - * Find all target addresses in code, so that they can be marked - * with <A NAME = ...>. Target addresses are kept in an BitSet object. - */ - private void findGotos( final ByteSequence bytes, final Code code ) throws IOException { - int index; - gotoSet = new BitSet(bytes.available()); - int opcode; - /* First get Code attribute from method and the exceptions handled - * (try .. catch) in this method. We only need the line number here. - */ - if (code != null) { - final CodeException[] ce = code.getExceptionTable(); - for (final CodeException cex : ce) { - gotoSet.set(cex.getStartPC()); - gotoSet.set(cex.getEndPC()); - gotoSet.set(cex.getHandlerPC()); - } - // Look for local variables and their range - final Attribute[] attributes = code.getAttributes(); - for (final Attribute attribute : attributes) { - if (attribute.getTag() == Const.ATTR_LOCAL_VARIABLE_TABLE) { - final LocalVariable[] vars = ((LocalVariableTable) attribute) - .getLocalVariableTable(); - for (final LocalVariable var : vars) { - final int start = var.getStartPC(); - final int end = start + var.getLength(); - gotoSet.set(start); - gotoSet.set(end); - } - break; - } - } - } - // Get target addresses from GOTO, JSR, TABLESWITCH, etc. - for (; bytes.available() > 0;) { - opcode = bytes.readUnsignedByte(); - //System.out.println(getOpcodeName(opcode)); - switch (opcode) { - case Const.TABLESWITCH: - case Const.LOOKUPSWITCH: - //bytes.readByte(); // Skip already read byte - final int remainder = bytes.getIndex() % 4; - final int no_pad_bytes = (remainder == 0) ? 0 : 4 - remainder; - int default_offset; - int offset; - for (int j = 0; j < no_pad_bytes; j++) { - bytes.readByte(); - } - // Both cases have a field default_offset in common - default_offset = bytes.readInt(); - if (opcode == Const.TABLESWITCH) { - final int low = bytes.readInt(); - final int high = bytes.readInt(); - offset = bytes.getIndex() - 12 - no_pad_bytes - 1; - default_offset += offset; - gotoSet.set(default_offset); - for (int j = 0; j < (high - low + 1); j++) { - index = offset + bytes.readInt(); - gotoSet.set(index); - } - } else { // LOOKUPSWITCH - final int npairs = bytes.readInt(); - offset = bytes.getIndex() - 8 - no_pad_bytes - 1; - default_offset += offset; - gotoSet.set(default_offset); - for (int j = 0; j < npairs; j++) { -// int match = bytes.readInt(); - bytes.readInt(); - index = offset + bytes.readInt(); - gotoSet.set(index); - } - } - break; - case Const.GOTO: - case Const.IFEQ: - case Const.IFGE: - case Const.IFGT: - case Const.IFLE: - case Const.IFLT: - case Const.IFNE: - case Const.IFNONNULL: - case Const.IFNULL: - case Const.IF_ACMPEQ: - case Const.IF_ACMPNE: - case Const.IF_ICMPEQ: - case Const.IF_ICMPGE: - case Const.IF_ICMPGT: - case Const.IF_ICMPLE: - case Const.IF_ICMPLT: - case Const.IF_ICMPNE: - case Const.JSR: - //bytes.readByte(); // Skip already read byte - index = bytes.getIndex() + bytes.readShort() - 1; - gotoSet.set(index); - break; - case Const.GOTO_W: - case Const.JSR_W: - //bytes.readByte(); // Skip already read byte - index = bytes.getIndex() + bytes.readInt() - 1; - gotoSet.set(index); - break; - default: - bytes.unreadByte(); - codeToHTML(bytes, 0); // Ignore output - } - } - } - - - /** - * Write a single method with the byte code associated with it. - */ - private void writeMethod( final Method method, final int method_number ) throws IOException { - // Get raw signature - final String signature = method.getSignature(); - // Get array of strings containing the argument types - final String[] args = Utility.methodSignatureArgumentTypes(signature, false); - // Get return type string - final String type = Utility.methodSignatureReturnType(signature, false); - // Get method name - final String name = method.getName(); - final String html_name = Class2HTML.toHTML(name); - // Get method's access flags - String access = Utility.accessToString(method.getAccessFlags()); - access = Utility.replace(access, " ", " "); - // Get the method's attributes, the Code Attribute in particular - final Attribute[] attributes = method.getAttributes(); - file.print("

" + access + " " + "" + Class2HTML.referenceType(type) + " " - + html_name + "("); - for (int i = 0; i < args.length; i++) { - file.print(Class2HTML.referenceType(args[i])); - if (i < args.length - 1) { - file.print(", "); - } - } - file.println(")

"); - Code c = null; - byte[] code = null; - if (attributes.length > 0) { - file.print("

Attributes

    \n"); - for (int i = 0; i < attributes.length; i++) { - byte tag = attributes[i].getTag(); - if (tag != Const.ATTR_UNKNOWN) { - file.print("
  • " - + Const.getAttributeName(tag) + "
    • \n"); - } else { - file.print("
  • " + attributes[i] + "
    • "); - } - if (tag == Const.ATTR_CODE) { - c = (Code) attributes[i]; - final Attribute[] attributes2 = c.getAttributes(); - code = c.getCode(); - file.print(""); - } - } - file.println("
"); - } - if (code != null) { // No code, an abstract method, e.g. - //System.out.println(name + "\n" + Utility.codeToString(code, constantPool, 0, -1)); - // Print the byte code - try (ByteSequence stream = new ByteSequence(code)) { - stream.mark(stream.available()); - findGotos(stream, c); - stream.reset(); - file.println("" - + ""); - for (; stream.available() > 0;) { - final int offset = stream.getIndex(); - final String str = codeToHTML(stream, method_number); - String anchor = ""; - /* - * Set an anchor mark if this line is targetted by a goto, jsr, etc. Defining an anchor for every - * line is very inefficient! - */ - if (gotoSet.get(offset)) { - anchor = ""; - } - String anchor2; - if (stream.getIndex() == code.length) { - anchor2 = "" + offset + ""; - } else { - anchor2 = "" + offset; - } - file.println(""); - } - } - // Mark last line, may be targetted from Attributes window - file.println(""); - file.println("
Byte
offset		InstructionArgument
" + anchor2 + "" + anchor + str + "
"); - } - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/ConstantHTML.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/ConstantHTML.java deleted file mode 100644 index 2d8f1bfe..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/ConstantHTML.java +++ /dev/null @@ -1,232 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.util; - -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.PrintWriter; - -import org.apache.bcel.Const; -import org.apache.bcel.classfile.Constant; -import org.apache.bcel.classfile.ConstantClass; -import org.apache.bcel.classfile.ConstantFieldref; -import org.apache.bcel.classfile.ConstantInterfaceMethodref; -import org.apache.bcel.classfile.ConstantMethodref; -import org.apache.bcel.classfile.ConstantNameAndType; -import org.apache.bcel.classfile.ConstantPool; -import org.apache.bcel.classfile.ConstantString; -import org.apache.bcel.classfile.Method; -import org.apache.bcel.classfile.Utility; - -/** - * Convert constant pool into HTML file. - * - * - */ -final class ConstantHTML { - - private final String className; // name of current class - private final String classPackage; // name of package - private final ConstantPool constantPool; // reference to constant pool - private final PrintWriter file; // file to write to - private final String[] constantRef; // String to return for cp[i] - private final Constant[] constants; // The constants in the cp - private final Method[] methods; - - - ConstantHTML(final String dir, final String class_name, final String class_package, final Method[] methods, - final ConstantPool constant_pool) throws IOException { - this.className = class_name; - this.classPackage = class_package; - this.constantPool = constant_pool; - this.methods = methods; - constants = constant_pool.getConstantPool(); - file = new PrintWriter(new FileOutputStream(dir + class_name + "_cp.html")); - constantRef = new String[constants.length]; - constantRef[0] = "<unknown>"; - file.println(""); - // Loop through constants, constants[0] is reserved - for (int i = 1; i < constants.length; i++) { - if (i % 2 == 0) { - file.print("\n"); - } - file.println("
"); - } else { - file.print("
"); - } - if (constants[i] != null) { - writeConstant(i); - } - file.print("
"); - file.close(); - } - - - String referenceConstant( final int index ) { - return constantRef[index]; - } - - - private void writeConstant( final int index ) { - final byte tag = constants[index].getTag(); - int class_index; - int name_index; - String ref; - // The header is always the same - file.println("

" + index + " " + Const.getConstantName(tag) - + "

"); - /* For every constant type get the needed parameters and print them appropiately - */ - switch (tag) { - case Const.CONSTANT_InterfaceMethodref: - case Const.CONSTANT_Methodref: - // Get class_index and name_and_type_index, depending on type - if (tag == Const.CONSTANT_Methodref) { - final ConstantMethodref c = (ConstantMethodref) constantPool.getConstant(index, - Const.CONSTANT_Methodref); - class_index = c.getClassIndex(); - name_index = c.getNameAndTypeIndex(); - } else { - final ConstantInterfaceMethodref c1 = (ConstantInterfaceMethodref) constantPool - .getConstant(index, Const.CONSTANT_InterfaceMethodref); - class_index = c1.getClassIndex(); - name_index = c1.getNameAndTypeIndex(); - } - // Get method name and its class - final String method_name = constantPool.constantToString(name_index, - Const.CONSTANT_NameAndType); - final String html_method_name = Class2HTML.toHTML(method_name); - // Partially compacted class name, i.e., / -> . - final String method_class = constantPool.constantToString(class_index, Const.CONSTANT_Class); - String short_method_class = Utility.compactClassName(method_class); // I.e., remove java.lang. - short_method_class = Utility.compactClassName(short_method_class, classPackage - + ".", true); // Remove class package prefix - // Get method signature - final ConstantNameAndType c2 = (ConstantNameAndType) constantPool.getConstant( - name_index, Const.CONSTANT_NameAndType); - final String signature = constantPool.constantToString(c2.getSignatureIndex(), - Const.CONSTANT_Utf8); - // Get array of strings containing the argument types - final String[] args = Utility.methodSignatureArgumentTypes(signature, false); - // Get return type string - final String type = Utility.methodSignatureReturnType(signature, false); - final String ret_type = Class2HTML.referenceType(type); - final StringBuilder buf = new StringBuilder("("); - for (int i = 0; i < args.length; i++) { - buf.append(Class2HTML.referenceType(args[i])); - if (i < args.length - 1) { - buf.append(", "); - } - } - buf.append(")"); - final String arg_types = buf.toString(); - if (method_class.equals(className)) { - ref = "" - + html_method_name + ""; - } else { - ref = "" - + short_method_class + "." + html_method_name; - } - constantRef[index] = ret_type + " " + short_method_class - + "." + html_method_name + " " + arg_types; - file.println("

" + ret_type + " " + ref + arg_types - + " \n

"); - break; - case Const.CONSTANT_Fieldref: - // Get class_index and name_and_type_index - final ConstantFieldref c3 = (ConstantFieldref) constantPool.getConstant(index, - Const.CONSTANT_Fieldref); - class_index = c3.getClassIndex(); - name_index = c3.getNameAndTypeIndex(); - // Get method name and its class (compacted) - final String field_class = constantPool.constantToString(class_index, Const.CONSTANT_Class); - String short_field_class = Utility.compactClassName(field_class); // I.e., remove java.lang. - short_field_class = Utility.compactClassName(short_field_class, - classPackage + ".", true); // Remove class package prefix - final String field_name = constantPool - .constantToString(name_index, Const.CONSTANT_NameAndType); - if (field_class.equals(className)) { - ref = "" + field_name + ""; - } else { - ref = "" + short_field_class - + "." + field_name + "\n"; - } - constantRef[index] = "" + short_field_class + "." - + field_name + ""; - file.println("

" + ref + "
\n" + "

"); - break; - case Const.CONSTANT_Class: - final ConstantClass c4 = (ConstantClass) constantPool.getConstant(index, Const.CONSTANT_Class); - name_index = c4.getNameIndex(); - final String class_name2 = constantPool.constantToString(index, tag); // / -> . - String short_class_name = Utility.compactClassName(class_name2); // I.e., remove java.lang. - short_class_name = Utility.compactClassName(short_class_name, classPackage + ".", - true); // Remove class package prefix - ref = "" + short_class_name - + ""; - constantRef[index] = "" + short_class_name + ""; - file.println("

" + ref + "

\n"); - break; - case Const.CONSTANT_String: - final ConstantString c5 = (ConstantString) constantPool.getConstant(index, - Const.CONSTANT_String); - name_index = c5.getStringIndex(); - final String str = Class2HTML.toHTML(constantPool.constantToString(index, tag)); - file.println("

" + str + "

\n"); - break; - case Const.CONSTANT_NameAndType: - final ConstantNameAndType c6 = (ConstantNameAndType) constantPool.getConstant(index, - Const.CONSTANT_NameAndType); - name_index = c6.getNameIndex(); - final int signature_index = c6.getSignatureIndex(); - file.println("

" - + Class2HTML.toHTML(constantPool.constantToString(index, tag)) - + "

\n"); - break; - default: - file.println("

" + Class2HTML.toHTML(constantPool.constantToString(index, tag)) + "\n"); - } // switch - } - - - private int getMethodNumber( final String str ) { - for (int i = 0; i < methods.length; i++) { - final String cmp = methods[i].getName() + methods[i].getSignature(); - if (cmp.equals(str)) { - return i; - } - } - return -1; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/InstructionFinder.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/InstructionFinder.java deleted file mode 100644 index f93cbe3e..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/InstructionFinder.java +++ /dev/null @@ -1,419 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.util; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.apache.bcel.Const; -import org.apache.bcel.generic.ClassGenException; -import org.apache.bcel.generic.InstructionHandle; -import org.apache.bcel.generic.InstructionList; - -/** - * InstructionFinder is a tool to search for given instructions patterns, i.e., - * match sequences of instructions in an instruction list via regular - * expressions. This can be used, e.g., in order to implement a peep hole - * optimizer that looks for code patterns and replaces them with faster - * equivalents. - * - *

- * This class internally uses the java.util.regex - * package to search for regular expressions. - * - * A typical application would look like this: - * - * 

- *
- *
- *   InstructionFinder f   = new InstructionFinder(il);
- *   String            pat = "IfInstruction ICONST_0 GOTO ICONST_1 NOP (IFEQ|IFNE)";
- *
- *   for (Iterator i = f.search(pat, constraint); i.hasNext(); ) {
- *   InstructionHandle[] match = (InstructionHandle[])i.next();
- *   ...
- *   il.delete(match[1], match[5]);
- *   ...
- *   }
- *
- *
- *
- * - * @see org.apache.bcel.generic.Instruction - * @see InstructionList - */ -public class InstructionFinder { - - private static final int OFFSET = 32767; // char + OFFSET is outside of LATIN-1 - private static final int NO_OPCODES = 256; // Potential number, some are not used - private static final Map map = new HashMap<>(); - private final InstructionList il; - private String ilString; // instruction list as string - private InstructionHandle[] handles; // map instruction - - - // list to array - /** - * @param il - * instruction list to search for given patterns - */ - public InstructionFinder(final InstructionList il) { - this.il = il; - reread(); - } - - - /** - * Reread the instruction list, e.g., after you've altered the list upon a - * match. - */ - public final void reread() { - final int size = il.getLength(); - final char[] buf = new char[size]; // Create a string with length equal to il length - handles = il.getInstructionHandles(); - // Map opcodes to characters - for (int i = 0; i < size; i++) { - buf[i] = makeChar(handles[i].getInstruction().getOpcode()); - } - ilString = new String(buf); - } - - - /** - * Map symbolic instruction names like "getfield" to a single character. - * - * @param pattern - * instruction pattern in lower case - * @return encoded string for a pattern such as "BranchInstruction". - */ - private static String mapName( final String pattern ) { - final String result = map.get(pattern); - if (result != null) { - return result; - } - for (short i = 0; i < NO_OPCODES; i++) { - if (pattern.equals(Const.getOpcodeName(i))) { - return "" + makeChar(i); - } - } - throw new IllegalArgumentException("Instruction unknown: " + pattern); - } - - - /** - * Replace symbolic names of instructions with the appropiate character and - * remove all white space from string. Meta characters such as +, * are - * ignored. - * - * @param pattern - * The pattern to compile - * @return translated regular expression string - */ - private static String compilePattern( final String pattern ) { - //Bug: BCEL-77 - Instructions are assumed to be english, to avoid odd Locale issues - final String lower = pattern.toLowerCase(Locale.ENGLISH); - final StringBuilder buf = new StringBuilder(); - final int size = pattern.length(); - for (int i = 0; i < size; i++) { - char ch = lower.charAt(i); - if (Character.isLetterOrDigit(ch)) { - final StringBuilder name = new StringBuilder(); - while ((Character.isLetterOrDigit(ch) || ch == '_') && i < size) { - name.append(ch); - if (++i < size) { - ch = lower.charAt(i); - } else { - break; - } - } - i--; - buf.append(mapName(name.toString())); - } else if (!Character.isWhitespace(ch)) { - buf.append(ch); - } - } - return buf.toString(); - } - - - /** - * @return the matched piece of code as an array of instruction (handles) - */ - private InstructionHandle[] getMatch( final int matched_from, final int match_length ) { - final InstructionHandle[] match = new InstructionHandle[match_length]; - System.arraycopy(handles, matched_from, match, 0, match_length); - return match; - } - - - /** - * Search for the given pattern in the instruction list. You can search for - * any valid opcode via its symbolic name, e.g. "istore". You can also use a - * super class or an interface name to match a whole set of instructions, e.g. - * "BranchInstruction" or "LoadInstruction". "istore" is also an alias for all - * "istore_x" instructions. Additional aliases are "if" for "ifxx", "if_icmp" - * for "if_icmpxx", "if_acmp" for "if_acmpxx". - * - * Consecutive instruction names must be separated by white space which will - * be removed during the compilation of the pattern. - * - * For the rest the usual pattern matching rules for regular expressions - * apply. - *

- * Example pattern: - * - * 

-     * search("BranchInstruction NOP ((IfInstruction|GOTO)+ ISTORE Instruction)*");
-     *
- * - *

- * If you alter the instruction list upon a match such that other matching - * areas are affected, you should call reread() to update the finder and call - * search() again, because the matches are cached. - * - * @param pattern - * the instruction pattern to search for, where case is ignored - * @param from - * where to start the search in the instruction list - * @param constraint - * optional CodeConstraint to check the found code pattern for - * user-defined constraints - * @return iterator of matches where e.nextElement() returns an array of - * instruction handles describing the matched area - */ - public final Iterator search( final String pattern, final InstructionHandle from, final CodeConstraint constraint ) { - final String search = compilePattern(pattern); - int start = -1; - for (int i = 0; i < handles.length; i++) { - if (handles[i] == from) { - start = i; // Where to start search from (index) - break; - } - } - if (start == -1) { - throw new ClassGenException("Instruction handle " + from - + " not found in instruction list."); - } - final Pattern regex = Pattern.compile(search); - final List matches = new ArrayList<>(); - final Matcher matcher = regex.matcher(ilString); - while (start < ilString.length() && matcher.find(start)) { - final int startExpr = matcher.start(); - final int endExpr = matcher.end(); - final int lenExpr = endExpr - startExpr; - final InstructionHandle[] match = getMatch(startExpr, lenExpr); - if ((constraint == null) || constraint.checkCode(match)) { - matches.add(match); - } - start = endExpr; - } - return matches.iterator(); - } - - - /** - * Start search beginning from the start of the given instruction list. - * - * @param pattern - * the instruction pattern to search for, where case is ignored - * @return iterator of matches where e.nextElement() returns an array of - * instruction handles describing the matched area - */ - public final Iterator search( final String pattern ) { - return search(pattern, il.getStart(), null); - } - - - /** - * Start search beginning from `from'. - * - * @param pattern - * the instruction pattern to search for, where case is ignored - * @param from - * where to start the search in the instruction list - * @return iterator of matches where e.nextElement() returns an array of - * instruction handles describing the matched area - */ - public final Iterator search( final String pattern, final InstructionHandle from ) { - return search(pattern, from, null); - } - - - /** - * Start search beginning from the start of the given instruction list. Check - * found matches with the constraint object. - * - * @param pattern - * the instruction pattern to search for, case is ignored - * @param constraint - * constraints to be checked on matching code - * @return instruction handle or `null' if the match failed - */ - public final Iterator search( final String pattern, final CodeConstraint constraint ) { - return search(pattern, il.getStart(), constraint); - } - - - /** - * Convert opcode number to char. - */ - private static char makeChar( final short opcode ) { - return (char) (opcode + OFFSET); - } - - - /** - * @return the inquired instruction list - */ - public final InstructionList getInstructionList() { - return il; - } - - /** - * Code patterns found may be checked using an additional user-defined - * constraint object whether they really match the needed criterion. I.e., - * check constraints that can not expressed with regular expressions. - * - */ - public interface CodeConstraint { - - /** - * @param match - * array of instructions matching the requested pattern - * @return true if the matched area is really useful - */ - boolean checkCode( InstructionHandle[] match ); - } - - // Initialize pattern map - static { - map.put("arithmeticinstruction","(irem|lrem|iand|ior|ineg|isub|lneg|fneg|fmul|ldiv|fadd|lxor|frem|idiv|land|ixor|ishr|fsub|lshl|fdiv|iadd|lor|dmul|lsub|ishl|imul|lmul|lushr|dneg|iushr|lshr|ddiv|drem|dadd|ladd|dsub)"); - map.put("invokeinstruction", "(invokevirtual|invokeinterface|invokestatic|invokespecial|invokedynamic)"); - map.put("arrayinstruction", "(baload|aastore|saload|caload|fastore|lastore|iaload|castore|iastore|aaload|bastore|sastore|faload|laload|daload|dastore)"); - map.put("gotoinstruction", "(goto|goto_w)"); - map.put("conversioninstruction", "(d2l|l2d|i2s|d2i|l2i|i2b|l2f|d2f|f2i|i2d|i2l|f2d|i2c|f2l|i2f)"); - map.put("localvariableinstruction","(fstore|iinc|lload|dstore|dload|iload|aload|astore|istore|fload|lstore)"); - map.put("loadinstruction", "(fload|dload|lload|iload|aload)"); - map.put("fieldinstruction", "(getfield|putstatic|getstatic|putfield)"); - map.put("cpinstruction", "(ldc2_w|invokeinterface|invokedynamic|multianewarray|putstatic|instanceof|getstatic|checkcast|getfield|invokespecial|ldc_w|invokestatic|invokevirtual|putfield|ldc|new|anewarray)"); - map.put("stackinstruction", "(dup2|swap|dup2_x2|pop|pop2|dup|dup2_x1|dup_x2|dup_x1)"); - map.put("branchinstruction", "(ifle|if_acmpne|if_icmpeq|if_acmpeq|ifnonnull|goto_w|iflt|ifnull|if_icmpne|tableswitch|if_icmple|ifeq|if_icmplt|jsr_w|if_icmpgt|ifgt|jsr|goto|ifne|ifge|lookupswitch|if_icmpge)"); - map.put("returninstruction", "(lreturn|ireturn|freturn|dreturn|areturn|return)"); - map.put("storeinstruction", "(istore|fstore|dstore|astore|lstore)"); - map.put("select", "(tableswitch|lookupswitch)"); - map.put("ifinstruction", "(ifeq|ifgt|if_icmpne|if_icmpeq|ifge|ifnull|ifne|if_icmple|if_icmpge|if_acmpeq|if_icmplt|if_acmpne|ifnonnull|iflt|if_icmpgt|ifle)"); - map.put("jsrinstruction", "(jsr|jsr_w)"); - map.put("variablelengthinstruction", "(tableswitch|jsr|goto|lookupswitch)"); - map.put("unconditionalbranch", "(goto|jsr|jsr_w|athrow|goto_w)"); - map.put("constantpushinstruction", "(dconst|bipush|sipush|fconst|iconst|lconst)"); - map.put("typedinstruction", "(imul|lsub|aload|fload|lor|new|aaload|fcmpg|iand|iaload|lrem|idiv|d2l|isub|dcmpg|dastore|ret|f2d|f2i|drem|iinc|i2c|checkcast|frem|lreturn|astore|lushr|daload|dneg|fastore|istore|lshl|ldiv|lstore|areturn|ishr|ldc_w|invokeinterface|invokedynamic|aastore|lxor|ishl|l2d|i2f|return|faload|sipush|iushr|caload|instanceof|invokespecial|putfield|fmul|ireturn|laload|d2f|lneg|ixor|i2l|fdiv|lastore|multianewarray|i2b|getstatic|i2d|putstatic|fcmpl|saload|ladd|irem|dload|jsr_w|dconst|dcmpl|fsub|freturn|ldc|aconst_null|castore|lmul|ldc2_w|dadd|iconst|f2l|ddiv|dstore|land|jsr|anewarray|dmul|bipush|dsub|sastore|d2i|i2s|lshr|iadd|l2i|lload|bastore|fstore|fneg|iload|fadd|baload|fconst|ior|ineg|dreturn|l2f|lconst|getfield|invokevirtual|invokestatic|iastore)"); - map.put("popinstruction", "(fstore|dstore|pop|pop2|astore|putstatic|istore|lstore)"); - map.put("allocationinstruction", "(multianewarray|new|anewarray|newarray)"); - map.put("indexedinstruction", "(lload|lstore|fload|ldc2_w|invokeinterface|invokedynamic|multianewarray|astore|dload|putstatic|instanceof|getstatic|checkcast|getfield|invokespecial|dstore|istore|iinc|ldc_w|ret|fstore|invokestatic|iload|putfield|invokevirtual|ldc|new|aload|anewarray)"); - map.put("pushinstruction", "(dup|lload|dup2|bipush|fload|ldc2_w|sipush|lconst|fconst|dload|getstatic|ldc_w|aconst_null|dconst|iload|ldc|iconst|aload)"); - map.put("stackproducer", "(imul|lsub|aload|fload|lor|new|aaload|fcmpg|iand|iaload|lrem|idiv|d2l|isub|dcmpg|dup|f2d|f2i|drem|i2c|checkcast|frem|lushr|daload|dneg|lshl|ldiv|ishr|ldc_w|invokeinterface|invokedynamic|lxor|ishl|l2d|i2f|faload|sipush|iushr|caload|instanceof|invokespecial|fmul|laload|d2f|lneg|ixor|i2l|fdiv|getstatic|i2b|swap|i2d|dup2|fcmpl|saload|ladd|irem|dload|jsr_w|dconst|dcmpl|fsub|ldc|arraylength|aconst_null|tableswitch|lmul|ldc2_w|iconst|dadd|f2l|ddiv|land|jsr|anewarray|dmul|bipush|dsub|d2i|newarray|i2s|lshr|iadd|lload|l2i|fneg|iload|fadd|baload|fconst|lookupswitch|ior|ineg|lconst|l2f|getfield|invokevirtual|invokestatic)"); - map.put("stackconsumer", "(imul|lsub|lor|iflt|fcmpg|if_icmpgt|iand|ifeq|if_icmplt|lrem|ifnonnull|idiv|d2l|isub|dcmpg|dastore|if_icmpeq|f2d|f2i|drem|i2c|checkcast|frem|lreturn|astore|lushr|pop2|monitorexit|dneg|fastore|istore|lshl|ldiv|lstore|areturn|if_icmpge|ishr|monitorenter|invokeinterface|invokedynamic|aastore|lxor|ishl|l2d|i2f|return|iushr|instanceof|invokespecial|fmul|ireturn|d2f|lneg|ixor|pop|i2l|ifnull|fdiv|lastore|i2b|if_acmpeq|ifge|swap|i2d|putstatic|fcmpl|ladd|irem|dcmpl|fsub|freturn|ifgt|castore|lmul|dadd|f2l|ddiv|dstore|land|if_icmpne|if_acmpne|dmul|dsub|sastore|ifle|d2i|i2s|lshr|iadd|l2i|bastore|fstore|fneg|fadd|ior|ineg|ifne|dreturn|l2f|if_icmple|getfield|invokevirtual|invokestatic|iastore)"); - map.put("exceptionthrower","(irem|lrem|laload|putstatic|baload|dastore|areturn|getstatic|ldiv|anewarray|iastore|castore|idiv|saload|lastore|fastore|putfield|lreturn|caload|getfield|return|aastore|freturn|newarray|instanceof|multianewarray|athrow|faload|iaload|aaload|dreturn|monitorenter|checkcast|bastore|arraylength|new|invokevirtual|sastore|ldc_w|ireturn|invokespecial|monitorexit|invokeinterface|invokedynamic|ldc|invokestatic|daload)"); - map.put("loadclass", "(multianewarray|invokeinterface|invokedynamic|instanceof|invokespecial|putfield|checkcast|putstatic|invokevirtual|new|getstatic|invokestatic|getfield|anewarray)"); - map.put("instructiontargeter", "(ifle|if_acmpne|if_icmpeq|if_acmpeq|ifnonnull|goto_w|iflt|ifnull|if_icmpne|tableswitch|if_icmple|ifeq|if_icmplt|jsr_w|if_icmpgt|ifgt|jsr|goto|ifne|ifge|lookupswitch|if_icmpge)"); - // Some aliases - map.put("if_icmp", "(if_icmpne|if_icmpeq|if_icmple|if_icmpge|if_icmplt|if_icmpgt)"); - map.put("if_acmp", "(if_acmpeq|if_acmpne)"); - map.put("if", "(ifeq|ifne|iflt|ifge|ifgt|ifle)"); - // Precompile some aliases first - map.put("iconst", precompile(Const.ICONST_0, Const.ICONST_5, Const.ICONST_M1)); - map.put("lconst", new String(new char[] { '(', makeChar(Const.LCONST_0), '|', makeChar(Const.LCONST_1), ')' })); - map.put("dconst", new String(new char[] { '(', makeChar(Const.DCONST_0), '|', makeChar(Const.DCONST_1), ')' })); - map.put("fconst", new String(new char[] { '(', makeChar(Const.FCONST_0), '|', makeChar(Const.FCONST_1), '|', makeChar(Const.FCONST_2), ')' })); - map.put("lload", precompile(Const.LLOAD_0, Const.LLOAD_3, Const.LLOAD)); - map.put("iload", precompile(Const.ILOAD_0, Const.ILOAD_3, Const.ILOAD)); - map.put("dload", precompile(Const.DLOAD_0, Const.DLOAD_3, Const.DLOAD)); - map.put("fload", precompile(Const.FLOAD_0, Const.FLOAD_3, Const.FLOAD)); - map.put("aload", precompile(Const.ALOAD_0, Const.ALOAD_3, Const.ALOAD)); - map.put("lstore", precompile(Const.LSTORE_0, Const.LSTORE_3, Const.LSTORE)); - map.put("istore", precompile(Const.ISTORE_0, Const.ISTORE_3, Const.ISTORE)); - map.put("dstore", precompile(Const.DSTORE_0, Const.DSTORE_3, Const.DSTORE)); - map.put("fstore", precompile(Const.FSTORE_0, Const.FSTORE_3, Const.FSTORE)); - map.put("astore", precompile(Const.ASTORE_0, Const.ASTORE_3, Const.ASTORE)); - // Compile strings - for (final Map.Entry entry : map.entrySet()) { - final String key = entry.getKey(); - final String value = entry.getValue(); - final char ch = value.charAt(1); // Omit already precompiled patterns - if (ch < OFFSET) { - map.put(key, compilePattern(value)); // precompile all patterns - } - } - // Add instruction alias to match anything - final StringBuilder buf = new StringBuilder("("); - for (short i = 0; i < NO_OPCODES; i++) { - if (Const.getNoOfOperands(i) != Const.UNDEFINED) { // Not an invalid opcode - buf.append(makeChar(i)); - if (i < NO_OPCODES - 1) { - buf.append('|'); - } - } - } - buf.append(')'); - map.put("instruction", buf.toString()); - } - - - private static String precompile( final short from, final short to, final short extra ) { - final StringBuilder buf = new StringBuilder("("); - for (short i = from; i <= to; i++) { - buf.append(makeChar(i)); - buf.append('|'); - } - buf.append(makeChar(extra)); - buf.append(")"); - return buf.toString(); - } - - - /* - * Internal debugging routines. - */ -// private static final String pattern2string( String pattern ) { -// return pattern2string(pattern, true); -// } - - -// private static final String pattern2string( String pattern, boolean make_string ) { -// StringBuffer buf = new StringBuffer(); -// for (int i = 0; i < pattern.length(); i++) { -// char ch = pattern.charAt(i); -// if (ch >= OFFSET) { -// if (make_string) { -// buf.append(Constants.getOpcodeName(ch - OFFSET)); -// } else { -// buf.append((ch - OFFSET)); -// } -// } else { -// buf.append(ch); -// } -// } -// return buf.toString(); -// } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/JavaWrapper.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/JavaWrapper.java deleted file mode 100644 index 2e0ee616..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/JavaWrapper.java +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.util; - -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; - -/** - * Java interpreter replacement, i.e., wrapper that uses its own ClassLoader - * to modify/generate classes as they're requested. You can take this as a template - * for your own applications. - *

- * Call this wrapper with: - *

- * 
java org.apache.bcel.util.JavaWrapper <real.class.name> [arguments]
- *

- * To use your own class loader you can set the "bcel.classloader" system property. - *

- * 
java org.apache.bcel.util.JavaWrapper -Dbcel.classloader=foo.MyLoader <real.class.name> [arguments]
- * - * @see ClassLoader - */ -public class JavaWrapper { - - private final java.lang.ClassLoader loader; - - - private static java.lang.ClassLoader getClassLoader() { - final String s = System.getProperty("bcel.classloader"); - if ((s == null) || "".equals(s)) { - throw new IllegalStateException("The property 'bcel.classloader' must be defined"); - } - try { - return (java.lang.ClassLoader) Class.forName(s).newInstance(); - } catch (final Exception e) { - throw new IllegalStateException(e.toString(), e); - } - } - - - public JavaWrapper(final java.lang.ClassLoader loader) { - this.loader = loader; - } - - - public JavaWrapper() { - this(getClassLoader()); - } - - - /** Runs the main method of the given class with the arguments passed in argv - * - * @param class_name the fully qualified class name - * @param argv the arguments just as you would pass them directly - */ - public void runMain( final String class_name, final String[] argv ) throws ClassNotFoundException { - final Class cl = loader.loadClass(class_name); - Method method = null; - try { - method = cl.getMethod("main", argv.getClass()); - /* Method main is sane ? - */ - final int m = method.getModifiers(); - final Class r = method.getReturnType(); - if (!(Modifier.isPublic(m) && Modifier.isStatic(m)) || Modifier.isAbstract(m) - || (r != Void.TYPE)) { - throw new NoSuchMethodException(); - } - } catch (final NoSuchMethodException no) { - System.out.println("In class " + class_name - + ": public static void main(String[] argv) is not defined"); - return; - } - try { - method.invoke(null, argv); - } catch (final Exception ex) { - ex.printStackTrace(); - } - } - - - /** Default main method used as wrapper, expects the fully qualified class name - * of the real class as the first argument. - */ - public static void main( final String[] argv ) throws Exception { - /* Expects class name as first argument, other arguments are by-passed. - */ - if (argv.length == 0) { - System.out.println("Missing class name."); - return; - } - final String class_name = argv[0]; - final String[] new_argv = new String[argv.length - 1]; - System.arraycopy(argv, 1, new_argv, 0, new_argv.length); - final JavaWrapper wrapper = new JavaWrapper(); - wrapper.runMain(class_name, new_argv); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/LruCacheClassPathRepository.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/LruCacheClassPathRepository.java deleted file mode 100644 index 157a0e74..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/LruCacheClassPathRepository.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.util; - -import java.util.LinkedHashMap; -import java.util.Map; - -import org.apache.bcel.classfile.JavaClass; - -/** - * Maintains a least-recently-used (LRU) cache of {@link JavaClass} with maximum size {@code cacheSize}. - * - *

- * This repository supports a class path consisting of too many JAR files to handle in {@link ClassPathRepository} or - * {@link MemorySensitiveClassPathRepository} without causing {@code OutOfMemoryError}. - *

- * - * @since 6.4.0 - */ -public class LruCacheClassPathRepository extends AbstractClassPathRepository { - - private final LinkedHashMap loadedClasses; - - public LruCacheClassPathRepository(final ClassPath path, final int cacheSize) { - super(path); - - if (cacheSize < 1) { - throw new IllegalArgumentException("cacheSize must be a positive number."); - } - final int initialCapacity = (int) (0.75 * cacheSize); - final boolean accessOrder = true; // Evicts least-recently-accessed - loadedClasses = new LinkedHashMap(initialCapacity, cacheSize, accessOrder) { - - private static final long serialVersionUID = 1L; - - @Override - protected boolean removeEldestEntry(final Map.Entry eldest) { - return size() > cacheSize; - } - }; - } - - @Override - public JavaClass findClass(final String className) { - return loadedClasses.get(className); - } - - @Override - public void storeClass(final JavaClass javaClass) { - // Not storing parent's _loadedClass - loadedClasses.put(javaClass.getClassName(), javaClass); - javaClass.setRepository(this); - } - - @Override - public void removeClass(final JavaClass javaClass) { - loadedClasses.remove(javaClass.getClassName()); - } - - @Override - public void clear() { - loadedClasses.clear(); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/MemorySensitiveClassPathRepository.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/MemorySensitiveClassPathRepository.java deleted file mode 100644 index cb49dcac..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/MemorySensitiveClassPathRepository.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.util; - -import java.lang.ref.SoftReference; -import java.util.HashMap; -import java.util.Map; - -import org.apache.bcel.classfile.JavaClass; - -/** - * This repository is used in situations where a Class is created outside the realm of a ClassLoader. Classes are loaded from the file systems using the paths - * specified in the given class path. By default, this is the value returned by ClassPath.getClassPath(). This repository holds onto classes with - * SoftReferences, and will reload as needed, in cases where memory sizes are important. - * - * @see org.apache.bcel.Repository - */ -public class MemorySensitiveClassPathRepository extends AbstractClassPathRepository { - - private final Map> loadedClasses = new HashMap<>(); // CLASSNAME X JAVACLASS - - public MemorySensitiveClassPathRepository(final ClassPath path) { - super(path); - } - - /** - * Store a new JavaClass instance into this Repository. - */ - @Override - public void storeClass(final JavaClass clazz) { - // Not calling super.storeClass because this subclass maintains the mapping. - loadedClasses.put(clazz.getClassName(), new SoftReference<>(clazz)); - clazz.setRepository(this); - } - - /** - * Remove class from repository - */ - @Override - public void removeClass(final JavaClass clazz) { - loadedClasses.remove(clazz.getClassName()); - } - - /** - * Find an already defined (cached) JavaClass object by name. - */ - @Override - public JavaClass findClass(final String className) { - final SoftReference ref = loadedClasses.get(className); - if (ref == null) { - return null; - } - return ref.get(); - } - - /** - * Clear all entries from cache. - */ - @Override - public void clear() { - loadedClasses.clear(); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/MethodHTML.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/MethodHTML.java deleted file mode 100644 index cff316c2..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/MethodHTML.java +++ /dev/null @@ -1,158 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.util; - -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.PrintWriter; - -import org.apache.bcel.Const; -import org.apache.bcel.classfile.Attribute; -import org.apache.bcel.classfile.Code; -import org.apache.bcel.classfile.ConstantValue; -import org.apache.bcel.classfile.ExceptionTable; -import org.apache.bcel.classfile.Field; -import org.apache.bcel.classfile.Method; -import org.apache.bcel.classfile.Utility; - -/** - * Convert methods and fields into HTML file. - * - * - */ -final class MethodHTML { - - private final String className; // name of current class - private final PrintWriter file; // file to write to - private final ConstantHTML constantHtml; - private final AttributeHTML attribute_html; - - - MethodHTML(final String dir, final String class_name, final Method[] methods, final Field[] fields, - final ConstantHTML constant_html, final AttributeHTML attribute_html) throws IOException { - this.className = class_name; - this.attribute_html = attribute_html; - this.constantHtml = constant_html; - file = new PrintWriter(new FileOutputStream(dir + class_name + "_methods.html")); - file.println(""); - file.println("" - + ""); - for (final Field field : fields) { - writeField(field); - } - file.println("
Access flagsTypeField name
"); - file.println("" - + "" - + ""); - for (int i = 0; i < methods.length; i++) { - writeMethod(methods[i], i); - } - file.println("
Access flagsReturn typeMethod nameArguments
"); - file.close(); - } - - - /** - * Print field of class. - * - * @param field field to print - * @throws java.io.IOException - */ - private void writeField( final Field field ) throws IOException { - final String type = Utility.signatureToString(field.getSignature()); - final String name = field.getName(); - String access = Utility.accessToString(field.getAccessFlags()); - Attribute[] attributes; - access = Utility.replace(access, " ", " "); - file.print("" + access + "\n" - + Class2HTML.referenceType(type) + "" + name - + ""); - attributes = field.getAttributes(); - // Write them to the Attributes.html file with anchor "[]" - for (int i = 0; i < attributes.length; i++) { - attribute_html.writeAttribute(attributes[i], name + "@" + i); - } - for (int i = 0; i < attributes.length; i++) { - if (attributes[i].getTag() == Const.ATTR_CONSTANT_VALUE) { // Default value - final String str = ((ConstantValue) attributes[i]).toString(); - // Reference attribute in _attributes.html - file.print("= " + str + "\n"); - break; - } - } - file.println(""); - } - - - private void writeMethod( final Method method, final int method_number ) { - // Get raw signature - final String signature = method.getSignature(); - // Get array of strings containing the argument types - final String[] args = Utility.methodSignatureArgumentTypes(signature, false); - // Get return type string - final String type = Utility.methodSignatureReturnType(signature, false); - // Get method name - final String name = method.getName(); - String html_name; - // Get method's access flags - String access = Utility.accessToString(method.getAccessFlags()); - // Get the method's attributes, the Code Attribute in particular - final Attribute[] attributes = method.getAttributes(); - /* HTML doesn't like names like and spaces are places to break - * lines. Both we don't want... - */ - access = Utility.replace(access, " ", " "); - html_name = Class2HTML.toHTML(name); - file.print("" + access + ""); - file.print("" + Class2HTML.referenceType(type) + "" + "" + html_name - + "\n("); - for (int i = 0; i < args.length; i++) { - file.print(Class2HTML.referenceType(args[i])); - if (i < args.length - 1) { - file.print(", "); - } - } - file.print(")"); - // Check for thrown exceptions - for (int i = 0; i < attributes.length; i++) { - attribute_html.writeAttribute(attributes[i], "method" + method_number + "@" + i, - method_number); - final byte tag = attributes[i].getTag(); - if (tag == Const.ATTR_EXCEPTIONS) { - file.print("throws"); - final int[] exceptions = ((ExceptionTable) attributes[i]).getExceptionIndexTable(); - for (int j = 0; j < exceptions.length; j++) { - file.print(constantHtml.referenceConstant(exceptions[j])); - if (j < exceptions.length - 1) { - file.print(", "); - } - } - file.println(""); - } else if (tag == Const.ATTR_CODE) { - final Attribute[] c_a = ((Code) attributes[i]).getAttributes(); - for (int j = 0; j < c_a.length; j++) { - attribute_html.writeAttribute(c_a[j], "method" + method_number + "@" + i + "@" - + j, method_number); - } - } - } - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/ModularRuntimeImage.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/ModularRuntimeImage.java deleted file mode 100644 index 64d698e5..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/ModularRuntimeImage.java +++ /dev/null @@ -1,152 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.util; - -import java.io.Closeable; -import java.io.File; -import java.io.IOException; -import java.net.URI; -import java.net.URL; -import java.net.URLClassLoader; -import java.nio.file.DirectoryStream; -import java.nio.file.FileSystem; -import java.nio.file.FileSystems; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -/** - * Wraps a Java 9 JEP 220 modular runtime image. Requires the JRT NIO file system. - * - * @since 6.3 - */ -public class ModularRuntimeImage implements Closeable { - - static final String MODULES_PATH = File.separator + "modules"; - static final String PACKAGES_PATH = File.separator + "packages"; - - private final URLClassLoader classLoader; - private final FileSystem fileSystem; - - /** - * Constructs a default instance. - * - * @throws IOException - * an I/O error occurs accessing the file system - */ - public ModularRuntimeImage() throws IOException { - this(null, FileSystems.getFileSystem(URI.create("jrt:/"))); - } - - /** - * Constructs an instance using the JRT file system implementation from a specific Java Home. - * - * @param javaHome - * Path to a Java 9 or greater home. - * - * @throws IOException - * an I/O error occurs accessing the file system - */ - public ModularRuntimeImage(final String javaHome) throws IOException { - final Map emptyMap = Collections.emptyMap(); - final Path jrePath = Paths.get(javaHome); - final Path jrtFsPath = jrePath.resolve("lib").resolve("jrt-fs.jar"); - this.classLoader = new URLClassLoader(new URL[] {jrtFsPath.toUri().toURL() }); - this.fileSystem = FileSystems.newFileSystem(URI.create("jrt:/"), emptyMap, classLoader); - } - - private ModularRuntimeImage(final URLClassLoader cl, final FileSystem fs) { - this.classLoader = cl; - this.fileSystem = fs; - } - - @Override - public void close() throws IOException { - if (classLoader != null) { - classLoader.close(); - } - if (fileSystem != null) { - fileSystem.close(); - } - } - - /** - * Lists all entries in the given directory. - * - * @param dirPath - * directory path. - * @return a list of dir entries if an I/O error occurs - * @throws IOException - * an I/O error occurs accessing the file system - */ - public List list(final Path dirPath) throws IOException { - final List list = new ArrayList<>(); - try (DirectoryStream ds = Files.newDirectoryStream(dirPath)) { - final Iterator iterator = ds.iterator(); - while (iterator.hasNext()) { - list.add(iterator.next()); - } - } - return list; - } - - /** - * Lists all entries in the given directory. - * - * @param dirName - * directory path. - * @return a list of dir entries if an I/O error occurs - * @throws IOException - * an I/O error occurs accessing the file system - */ - public List list(final String dirName) throws IOException { - return list(fileSystem.getPath(dirName)); - } - - /** - * Lists all modules. - * - * @return a list of modules - * @throws IOException - * an I/O error occurs accessing the file system - */ - public List modules() throws IOException { - return list(MODULES_PATH); - } - - /** - * Lists all packages. - * - * @return a list of modules - * @throws IOException - * an I/O error occurs accessing the file system - */ - public List packages() throws IOException { - return list(PACKAGES_PATH); - } - - public FileSystem getFileSystem() { - return fileSystem; - } - -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/Repository.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/Repository.java deleted file mode 100644 index 60eee303..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/Repository.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.util; - -import org.apache.bcel.classfile.JavaClass; - -/** - * Abstract definition of a class repository. Instances may be used to load classes from different sources and may be - * used in the Repository.setRepository method. - * - * @see org.apache.bcel.Repository - */ -public interface Repository { - - /** - * Stores the provided class under "clazz.getClassName()" - */ - void storeClass(JavaClass clazz); - - /** - * Removes class from repository - */ - void removeClass(JavaClass clazz); - - /** - * Finds the class with the name provided, if the class isn't there, return NULL. - */ - JavaClass findClass(String className); - - /** - * Finds the class with the name provided, if the class isn't there, make an attempt to load it. - */ - JavaClass loadClass(String className) throws java.lang.ClassNotFoundException; - - /** - * Finds the JavaClass instance for the given run-time class object - */ - JavaClass loadClass(Class clazz) throws java.lang.ClassNotFoundException; - - /** - * Clears all entries from cache. - */ - void clear(); - - /** - * Gets the ClassPath associated with this Repository - */ - ClassPath getClassPath(); -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/SyntheticRepository.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/SyntheticRepository.java deleted file mode 100644 index f5c0b86f..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/SyntheticRepository.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.util; - -import java.util.HashMap; -import java.util.Map; - -/** - * This repository is used in situations where a Class is created outside the realm of a ClassLoader. Classes are loaded from the file systems using the paths - * specified in the given class path. By default, this is the value returned by ClassPath.getClassPath(). - *

- * This repository uses a factory design, allowing it to maintain a collection of different classpaths, and as such It is designed to be used as a singleton per - * classpath. - *

- * - * @see org.apache.bcel.Repository - * - */ -public class SyntheticRepository extends MemorySensitiveClassPathRepository { - - // private static final String DEFAULT_PATH = ClassPath.getClassPath(); - private static final Map instances = new HashMap<>(); // CLASSPATH X REPOSITORY - - private SyntheticRepository(final ClassPath path) { - super(path); - } - - public static SyntheticRepository getInstance() { - return getInstance(ClassPath.SYSTEM_CLASS_PATH); - } - - public static SyntheticRepository getInstance(final ClassPath classPath) { - SyntheticRepository rep = instances.get(classPath); - if (rep == null) { - rep = new SyntheticRepository(classPath); - instances.put(classPath, rep); - } - return rep; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/package.html b/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/package.html deleted file mode 100644 index f1fad395..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/util/package.html +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - -

-This package contains utility classes for the -Byte Code Engineering -Library, namely: -

-
    -
  • Collection classes for JavaClass objects
    • -
  • A converter for class files to HTML
    • -
  • A tool to find instructions patterns via regular expressions
    • -
  • A class to find classes as defined in the CLASSPATH
    • -
  • A class loader that allows to create classes at run time
    • -
- - - diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/GraphicalVerifier.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/GraphicalVerifier.java deleted file mode 100644 index dfc1c8fa..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/GraphicalVerifier.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.verifier; - -import java.awt.Dimension; -import java.awt.Toolkit; -import javax.swing.UIManager; - -import org.apache.bcel.generic.Type; - -/** - * A graphical user interface application demonstrating JustIce. - * - */ -public class GraphicalVerifier { - - private final boolean packFrame = false; - - - /** Constructor. */ - public GraphicalVerifier() { - final VerifierAppFrame frame = new VerifierAppFrame(); - //Frames �berpr�fen, die voreingestellte Gr��e haben - //Frames packen, die nutzbare bevorzugte Gr��eninformationen enthalten, z.B. aus ihrem Layout - if (packFrame) { - frame.pack(); - } else { - frame.validate(); - } - //Das Fenster zentrieren - final Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - final Dimension frameSize = frame.getSize(); - if (frameSize.height > screenSize.height) { - frameSize.height = screenSize.height; - } - if (frameSize.width > screenSize.width) { - frameSize.width = screenSize.width; - } - frame.setLocation((screenSize.width - frameSize.width) / 2, - (screenSize.height - frameSize.height) / 2); - frame.setVisible(true); - frame.getClassNamesJList().setModel(new VerifierFactoryListModel()); - VerifierFactory.getVerifier(Type.OBJECT.getClassName()); // Fill list with java.lang.Object - frame.getClassNamesJList().setSelectedIndex(0); // default, will verify java.lang.Object - } - - - /** Main method. */ - public static void main( final String[] args ) { - try { - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (final Exception e) { - e.printStackTrace(); - } - new GraphicalVerifier(); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/NativeVerifier.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/NativeVerifier.java deleted file mode 100644 index 300e24d7..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/NativeVerifier.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.verifier; - -/** - * The NativeVerifier class implements a main(String[] args) method that's - * roughly compatible to the one in the Verifier class, but that uses the - * JVM's internal verifier for its class file verification. - * This can be used for comparison runs between the JVM-internal verifier - * and JustIce. - * - */ -public abstract class NativeVerifier { - - /** - * This class must not be instantiated. - */ - private NativeVerifier() { - } - - - /** - * Works only on the first argument. - */ - public static void main( final String[] args ) { - if (args.length != 1) { - System.out.println("Verifier front-end: need exactly one argument."); - System.exit(1); - } - final int dotclasspos = args[0].lastIndexOf(".class"); - if (dotclasspos != -1) { - args[0] = args[0].substring(0, dotclasspos); - } - args[0] = args[0].replace('/', '.'); - //System.out.println(args[0]); - try { - Class.forName(args[0]); - } catch (final ExceptionInInitializerError eiie) { //subclass of LinkageError! - System.out.println("NativeVerifier: ExceptionInInitializerError encountered on '" - + args[0] + "'."); - System.out.println(eiie); - System.exit(1); - } catch (final LinkageError le) { - System.out.println("NativeVerifier: LinkageError encountered on '" + args[0] + "'."); - System.out.println(le); - System.exit(1); - } catch (final ClassNotFoundException cnfe) { - System.out.println("NativeVerifier: FILE NOT FOUND: '" + args[0] + "'."); - System.exit(1); - } catch (final Throwable t) { // OK to catch Throwable here as we call exit. - System.out.println("NativeVerifier: Unspecified verification error on '" + args[0] + "'."); - System.exit(1); - } - System.out.println("NativeVerifier: Class file '" + args[0] + "' seems to be okay."); - System.exit(0); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/PassVerifier.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/PassVerifier.java deleted file mode 100644 index 8148968c..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/PassVerifier.java +++ /dev/null @@ -1,104 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.verifier; - -import java.util.ArrayList; -import java.util.List; - -/** - * A PassVerifier actually verifies a class file; it is instantiated - * by a Verifier. - * The verification should conform with a certain pass as described - * in The Java Virtual Machine Specification, 2nd edition. - * This book describes four passes. Pass one means loading the - * class and verifying a few static constraints. Pass two actually - * verifies some other constraints that could enforce loading in - * referenced class files. Pass three is the first pass that actually - * checks constraints in the code array of a method in the class file; - * it has two parts with the first verifying static constraints and - * the second part verifying structural constraints (where a data flow - * analysis is used for). The fourth pass, finally, performs checks - * that can only be done at run-time. - * JustIce does not have a run-time pass, but certain constraints that - * are usually delayed until run-time for performance reasons are also - * checked during the second part of pass three. - * PassVerifier instances perform caching. - * That means, if you really want a new verification run of a certain - * pass you must use a new instance of a given PassVerifier. - * - * @see Verifier - * @see #verify() - */ -public abstract class PassVerifier { - - /** The (warning) messages. */ - private final List messages = new ArrayList<>(); - /** The VerificationResult cache. */ - private VerificationResult verificationResult = null; - - - /** - * This method runs a verification pass conforming to the - * Java Virtual Machine Specification, 2nd edition, on a - * class file. - * PassVerifier instances perform caching; - * i.e. if the verify() method once determined a VerificationResult, - * then this result may be returned after every invocation of this - * method instead of running the verification pass anew; likewise with - * the result of getMessages(). - * - * @see #getMessages() - * @see #addMessage(String) - */ - public VerificationResult verify() { - if (verificationResult == null) { - verificationResult = do_verify(); - } - return verificationResult; - } - - - /** Does the real verification work, uncached. */ - public abstract VerificationResult do_verify(); - - - /** - * This method adds a (warning) message to the message pool of this - * PassVerifier. This method is normally only internally used by - * BCEL's class file verifier "JustIce" and should not be used from - * the outside. - * - * @see #getMessages() - */ - public void addMessage( final String message ) { - messages.add(message); - } - - - /** - * Returns the (warning) messages that this PassVerifier accumulated - * during its do_verify()ing work. - * - * @see #addMessage(String) - * @see #do_verify() - */ - public String[] getMessages() { - verify(); // create messages if not already done (cached!) - return messages.toArray(new String[messages.size()]); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/TransitiveHull.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/TransitiveHull.java deleted file mode 100644 index 75b077e8..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/TransitiveHull.java +++ /dev/null @@ -1,104 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.verifier; - -import org.apache.bcel.Repository; -import org.apache.bcel.classfile.JavaClass; - -/** - * This class has a main method implementing a demonstration program - * of how to use the VerifierFactoryObserver. It transitively verifies - * all class files encountered; this may take up a lot of time and, - * more notably, memory. - * - */ -public class TransitiveHull implements VerifierFactoryObserver { - - /** Used for indentation. */ - private int indent = 0; - - - /** Not publicly instantiable. */ - private TransitiveHull() { - } - - - /* Implementing VerifierFactoryObserver. */ - @Override - public void update( final String classname ) { - System.gc(); // avoid swapping if possible. - for (int i = 0; i < indent; i++) { - System.out.print(" "); - } - System.out.println(classname); - indent += 1; - final Verifier v = VerifierFactory.getVerifier(classname); - VerificationResult vr; - vr = v.doPass1(); - if (vr != VerificationResult.VR_OK) { - System.out.println("Pass 1:\n" + vr); - } - vr = v.doPass2(); - if (vr != VerificationResult.VR_OK) { - System.out.println("Pass 2:\n" + vr); - } - if (vr == VerificationResult.VR_OK) { - try { - final JavaClass jc = Repository.lookupClass(v.getClassName()); - for (int i = 0; i < jc.getMethods().length; i++) { - vr = v.doPass3a(i); - if (vr != VerificationResult.VR_OK) { - System.out.println(v.getClassName() + ", Pass 3a, method " + i + " ['" - + jc.getMethods()[i] + "']:\n" + vr); - } - vr = v.doPass3b(i); - if (vr != VerificationResult.VR_OK) { - System.out.println(v.getClassName() + ", Pass 3b, method " + i + " ['" - + jc.getMethods()[i] + "']:\n" + vr); - } - } - } catch (final ClassNotFoundException e) { - System.err.println("Could not find class " + v.getClassName() + " in Repository"); - } - } - indent -= 1; - } - - - /** - * This method implements a demonstration program - * of how to use the VerifierFactoryObserver. It transitively verifies - * all class files encountered; this may take up a lot of time and, - * more notably, memory. - */ - public static void main( final String[] args ) { - if (args.length != 1) { - System.out.println("Need exactly one argument: The root class to verify."); - System.exit(1); - } - final int dotclasspos = args[0].lastIndexOf(".class"); - if (dotclasspos != -1) { - args[0] = args[0].substring(0, dotclasspos); - } - args[0] = args[0].replace('/', '.'); - final TransitiveHull th = new TransitiveHull(); - VerifierFactory.attach(th); - VerifierFactory.getVerifier(args[0]); // the observer is called back and does the actual trick. - VerifierFactory.detach(th); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/VerificationResult.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/VerificationResult.java deleted file mode 100644 index f014ffa2..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/VerificationResult.java +++ /dev/null @@ -1,126 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.verifier; - -/** - * A VerificationResult is what a PassVerifier returns - * after verifying. - * - */ -public class VerificationResult { - - /** - * Constant to indicate verification has not been tried yet. - * This happens if some earlier verification pass did not return VERIFIED_OK. - */ - public static final int VERIFIED_NOTYET = 0; - - /** Constant to indicate verification was passed. */ - public static final int VERIFIED_OK = 1; - - /** Constant to indicate verfication failed. */ - public static final int VERIFIED_REJECTED = 2; - - /** - * This string is the canonical message for verifications that have not been tried yet. - * This happens if some earlier verification pass did not return {@link #VERIFIED_OK}. - */ - private static final String VERIFIED_NOTYET_MSG = "Not yet verified."; - - /** This string is the canonical message for passed verification passes. */ - private static final String VERIFIED_OK_MSG = "Passed verification."; - - /** - * Canonical VerificationResult for not-yet-tried verifications. - * This happens if some earlier verification pass did not return {@link #VERIFIED_OK}. - */ - public static final VerificationResult VR_NOTYET = new VerificationResult(VERIFIED_NOTYET, VERIFIED_NOTYET_MSG); - - /** Canonical VerificationResult for passed verifications. */ - public static final VerificationResult VR_OK = new VerificationResult(VERIFIED_OK, VERIFIED_OK_MSG); - - /** The numeric status. */ - private final int numeric; - - /** The detailed message. */ - private final String detailMessage; - - - /** The usual constructor. */ - public VerificationResult(final int status, final String message) { - numeric = status; - detailMessage = message; - } - - - /** - * Returns one of the {@link #VERIFIED_OK}, {@link #VERIFIED_NOTYET}, - * {@link #VERIFIED_REJECTED} constants. - */ - public int getStatus() { - return numeric; - } - - - /** Returns a detailed message. */ - public String getMessage() { - return detailMessage; - } - - - /** - * @return a hash code value for the object. - */ - @Override - public int hashCode() { - return numeric ^ detailMessage.hashCode(); - } - - - /** - * Returns if two VerificationResult instances are equal. - */ - @Override - public boolean equals( final Object o ) { - if (!(o instanceof VerificationResult)) { - return false; - } - final VerificationResult other = (VerificationResult) o; - return (other.numeric == this.numeric) && other.detailMessage.equals(this.detailMessage); - } - - - /** - * Returns a String representation of the VerificationResult. - */ - @Override - public String toString() { - String ret = ""; - if (numeric == VERIFIED_NOTYET) { - ret = "VERIFIED_NOTYET"; - } - if (numeric == VERIFIED_OK) { - ret = "VERIFIED_OK"; - } - if (numeric == VERIFIED_REJECTED) { - ret = "VERIFIED_REJECTED"; - } - ret += "\n" + detailMessage + "\n"; - return ret; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/Verifier.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/Verifier.java deleted file mode 100644 index 2dd60874..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/Verifier.java +++ /dev/null @@ -1,246 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.verifier; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apache.bcel.classfile.JavaClass; -import org.apache.bcel.verifier.statics.Pass1Verifier; -import org.apache.bcel.verifier.statics.Pass2Verifier; -import org.apache.bcel.verifier.statics.Pass3aVerifier; -import org.apache.bcel.verifier.structurals.Pass3bVerifier; - -/** - * A Verifier instance is there to verify a class file according to The Java Virtual - * Machine Specification, 2nd Edition. - * - * Pass-3b-verification includes pass-3a-verification; - * pass-3a-verification includes pass-2-verification; - * pass-2-verification includes pass-1-verification. - * - * A Verifier creates PassVerifier instances to perform the actual verification. - * Verifier instances are usually generated by the VerifierFactory. - * - * @see VerifierFactory - * @see PassVerifier - */ -public class Verifier { - - /** - * The name of the class this verifier operates on. - */ - private final String classname; - /** A Pass1Verifier for this Verifier instance. */ - private Pass1Verifier p1v; - /** A Pass2Verifier for this Verifier instance. */ - private Pass2Verifier p2v; - /** The Pass3aVerifiers for this Verifier instance. Key: Interned string specifying the method number. */ - private final Map p3avs = new HashMap<>(); - /** The Pass3bVerifiers for this Verifier instance. Key: Interned string specifying the method number. */ - private final Map p3bvs = new HashMap<>(); - - - /** Returns the VerificationResult for the given pass. */ - public VerificationResult doPass1() { - if (p1v == null) { - p1v = new Pass1Verifier(this); - } - return p1v.verify(); - } - - - /** Returns the VerificationResult for the given pass. */ - public VerificationResult doPass2() { - if (p2v == null) { - p2v = new Pass2Verifier(this); - } - return p2v.verify(); - } - - - /** Returns the VerificationResult for the given pass. */ - public VerificationResult doPass3a( final int method_no ) { - final String key = Integer.toString(method_no); - Pass3aVerifier p3av; - p3av = p3avs.get(key); - if (p3avs.get(key) == null) { - p3av = new Pass3aVerifier(this, method_no); - p3avs.put(key, p3av); - } - return p3av.verify(); - } - - - /** Returns the VerificationResult for the given pass. */ - public VerificationResult doPass3b( final int method_no ) { - final String key = Integer.toString(method_no); - Pass3bVerifier p3bv; - p3bv = p3bvs.get(key); - if (p3bvs.get(key) == null) { - p3bv = new Pass3bVerifier(this, method_no); - p3bvs.put(key, p3bv); - } - return p3bv.verify(); - } - - - /** - * Instantiation is done by the VerifierFactory. - * - * @see VerifierFactory - */ - Verifier(final String fully_qualified_classname) { - classname = fully_qualified_classname; - flush(); - } - - - /** - * Returns the name of the class this verifier operates on. - * This is particularly interesting when this verifier was created - * recursively by another Verifier and you got a reference to this - * Verifier by the getVerifiers() method of the VerifierFactory. - * @see VerifierFactory - */ - public final String getClassName() { - return classname; - } - - - /** - * Forget everything known about the class file; that means, really - * start a new verification of a possibly different class file from - * BCEL's repository. - * - */ - public void flush() { - p1v = null; - p2v = null; - p3avs.clear(); - p3bvs.clear(); - } - - - /** - * This returns all the (warning) messages collected during verification. - * A prefix shows from which verifying pass a message originates. - */ - public String[] getMessages() throws ClassNotFoundException { - final List messages = new ArrayList<>(); - if (p1v != null) { - final String[] p1m = p1v.getMessages(); - for (final String element : p1m) { - messages.add("Pass 1: " + element); - } - } - if (p2v != null) { - final String[] p2m = p2v.getMessages(); - for (final String element : p2m) { - messages.add("Pass 2: " + element); - } - } - for (final Pass3aVerifier pv : p3avs.values()) { - final String[] p3am = pv.getMessages(); - final int meth = pv.getMethodNo(); - for (final String element : p3am) { - messages.add("Pass 3a, method " + meth + " ('" - + org.apache.bcel.Repository.lookupClass(classname).getMethods()[meth] - + "'): " + element); - } - } - for (final Pass3bVerifier pv : p3bvs.values()) { - final String[] p3bm = pv.getMessages(); - final int meth = pv.getMethodNo(); - for (final String element : p3bm) { - messages.add("Pass 3b, method " + meth + " ('" - + org.apache.bcel.Repository.lookupClass(classname).getMethods()[meth] - + "'): " + element); - } - } - - return messages.toArray(new String[messages.size()]); - } - - - /** - * Verifies class files. - * This is a simple demonstration of how the API of BCEL's - * class file verifier "JustIce" may be used. - * You should supply command-line arguments which are - * fully qualified namea of the classes to verify. These class files - * must be somewhere in your CLASSPATH (refer to Sun's - * documentation for questions about this) or you must have put the classes - * into the BCEL Repository yourself (via 'addClass(JavaClass)'). - */ - public static void main( final String[] args ) { - System.out - .println("JustIce by Enver Haase, (C) 2001-2002.\n\n\n"); - for (int index = 0; index < args.length; index++) { - try { - if (args[index].endsWith(".class")) { - final int dotclasspos = args[index].lastIndexOf(".class"); - if (dotclasspos != -1) { - args[index] = args[index].substring(0, dotclasspos); - } - } - args[index] = args[index].replace('/', '.'); - System.out.println("Now verifying: " + args[index] + "\n"); - verifyType(args[index]); - org.apache.bcel.Repository.clearCache(); - System.gc(); - } catch (final ClassNotFoundException e) { - e.printStackTrace(); - } - } - } - - - static void verifyType(final String fullyQualifiedClassName) throws ClassNotFoundException { - final Verifier verifier = VerifierFactory.getVerifier(fullyQualifiedClassName); - VerificationResult verificationResult; - verificationResult = verifier.doPass1(); - System.out.println("Pass 1:\n" + verificationResult); - verificationResult = verifier.doPass2(); - System.out.println("Pass 2:\n" + verificationResult); - if (verificationResult == VerificationResult.VR_OK) { - final JavaClass jc = org.apache.bcel.Repository.lookupClass(fullyQualifiedClassName); - for (int i = 0; i < jc.getMethods().length; i++) { - verificationResult = verifier.doPass3a(i); - System.out.println("Pass 3a, method number " + i + " ['" - + jc.getMethods()[i] + "']:\n" + verificationResult); - verificationResult = verifier.doPass3b(i); - System.out.println("Pass 3b, method number " + i + " ['" - + jc.getMethods()[i] + "']:\n" + verificationResult); - } - } - System.out.println("Warnings:"); - final String[] warnings = verifier.getMessages(); - if (warnings.length == 0) { - System.out.println(""); - } - for (final String warning : warnings) { - System.out.println(warning); - } - System.out.println("\n"); - // avoid swapping. - verifier.flush(); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/VerifierAppFrame.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/VerifierAppFrame.java deleted file mode 100644 index 1baf2761..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/VerifierAppFrame.java +++ /dev/null @@ -1,384 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.verifier; - -import java.awt.AWTEvent; -import java.awt.CardLayout; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.GridLayout; -import java.awt.event.ActionEvent; -import java.awt.event.InputEvent; -import java.awt.event.WindowEvent; -import javax.swing.BorderFactory; -import javax.swing.JFrame; -import javax.swing.JList; -import javax.swing.JMenu; -import javax.swing.JMenuBar; -import javax.swing.JMenuItem; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.JScrollPane; -import javax.swing.JSplitPane; -import javax.swing.JTextPane; -import javax.swing.ListSelectionModel; -import javax.swing.event.ListSelectionEvent; - -import org.apache.bcel.Repository; -import org.apache.bcel.classfile.JavaClass; - -/** - * This class implements a machine-generated frame for use with - * the GraphicalVerfifier. - * - * @see GraphicalVerifier - */ -public class VerifierAppFrame extends JFrame { - - private static final long serialVersionUID = -542458133073307640L; - private static final String JUSTICE_VERSION = "JustIce by Enver Haase"; - - private JPanel contentPane; - private final JSplitPane jSplitPane1 = new JSplitPane(); - private final JPanel jPanel1 = new JPanel(); - private final JPanel jPanel2 = new JPanel(); - private final JSplitPane jSplitPane2 = new JSplitPane(); - private final JPanel jPanel3 = new JPanel(); - private final JList classNamesJList = new JList<>(); - private final GridLayout gridLayout1 = new GridLayout(); - private final JPanel messagesPanel = new JPanel(); - private final GridLayout gridLayout2 = new GridLayout(); - private final JMenuBar jMenuBar1 = new JMenuBar(); - private final JMenu jMenu1 = new JMenu(); - private final JScrollPane jScrollPane1 = new JScrollPane(); - private final JScrollPane messagesScrollPane = new JScrollPane(); - private final JScrollPane jScrollPane3 = new JScrollPane(); - private final GridLayout gridLayout4 = new GridLayout(); - private final JScrollPane jScrollPane4 = new JScrollPane(); - private final CardLayout cardLayout1 = new CardLayout(); - private String current_class; - private final GridLayout gridLayout3 = new GridLayout(); - private final JTextPane pass1TextPane = new JTextPane(); - private final JTextPane pass2TextPane = new JTextPane(); - private final JTextPane messagesTextPane = new JTextPane(); - private final JMenuItem newFileMenuItem = new JMenuItem(); - private final JSplitPane jSplitPane3 = new JSplitPane(); - private final JSplitPane jSplitPane4 = new JSplitPane(); - private final JScrollPane jScrollPane2 = new JScrollPane(); - private final JScrollPane jScrollPane5 = new JScrollPane(); - private final JScrollPane jScrollPane6 = new JScrollPane(); - private final JScrollPane jScrollPane7 = new JScrollPane(); - private final JList pass3aJList = new JList<>(); - private final JList pass3bJList = new JList<>(); - private final JTextPane pass3aTextPane = new JTextPane(); - private final JTextPane pass3bTextPane = new JTextPane(); - private final JMenu jMenu2 = new JMenu(); - private final JMenuItem whatisMenuItem = new JMenuItem(); - private final JMenuItem aboutMenuItem = new JMenuItem(); - - - /** Constructor. */ - public VerifierAppFrame() { - enableEvents(AWTEvent.WINDOW_EVENT_MASK); - try { - jbInit(); - } catch (final Exception e) { - e.printStackTrace(); - } - } - - - /** Initizalization of the components. */ - private void jbInit() throws Exception { - //setIconImage(Toolkit.getDefaultToolkit().createImage(Frame1.class.getResource("[Ihr Symbol]"))); - contentPane = (JPanel) this.getContentPane(); - contentPane.setLayout(cardLayout1); - this.setJMenuBar(jMenuBar1); - this.setSize(new Dimension(708, 451)); - this.setTitle("JustIce"); - jPanel1.setMinimumSize(new Dimension(100, 100)); - jPanel1.setPreferredSize(new Dimension(100, 100)); - jPanel1.setLayout(gridLayout1); - jSplitPane2.setOrientation(JSplitPane.VERTICAL_SPLIT); - jPanel2.setLayout(gridLayout2); - jPanel3.setMinimumSize(new Dimension(200, 100)); - jPanel3.setPreferredSize(new Dimension(400, 400)); - jPanel3.setLayout(gridLayout4); - messagesPanel.setMinimumSize(new Dimension(100, 100)); - messagesPanel.setLayout(gridLayout3); - jPanel2.setMinimumSize(new Dimension(200, 100)); - jMenu1.setText("File"); - jScrollPane1.getViewport().setBackground(Color.red); - messagesScrollPane.getViewport().setBackground(Color.red); - messagesScrollPane.setPreferredSize(new Dimension(10, 10)); - classNamesJList.addListSelectionListener(e -> classNamesJList_valueChanged(e)); - classNamesJList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - jScrollPane3.setBorder(BorderFactory.createLineBorder(Color.black)); - jScrollPane3.setPreferredSize(new Dimension(100, 100)); - gridLayout4.setRows(4); - gridLayout4.setColumns(1); - gridLayout4.setHgap(1); - jScrollPane4.setBorder(BorderFactory.createLineBorder(Color.black)); - jScrollPane4.setPreferredSize(new Dimension(100, 100)); - pass1TextPane.setBorder(BorderFactory.createRaisedBevelBorder()); - pass1TextPane.setToolTipText(""); - pass1TextPane.setEditable(false); - pass2TextPane.setBorder(BorderFactory.createRaisedBevelBorder()); - pass2TextPane.setEditable(false); - messagesTextPane.setBorder(BorderFactory.createRaisedBevelBorder()); - messagesTextPane.setEditable(false); - newFileMenuItem.setText("New..."); - newFileMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(78, - InputEvent.CTRL_MASK, true)); - newFileMenuItem.addActionListener(e -> newFileMenuItem_actionPerformed(e)); - pass3aTextPane.setEditable(false); - pass3bTextPane.setEditable(false); - pass3aJList.addListSelectionListener(e -> pass3aJList_valueChanged(e)); - pass3bJList.addListSelectionListener(e -> pass3bJList_valueChanged(e)); - jMenu2.setText("Help"); - whatisMenuItem.setText("What is..."); - whatisMenuItem.addActionListener(e -> whatisMenuItem_actionPerformed(e)); - aboutMenuItem.setText("About"); - aboutMenuItem.addActionListener(e -> aboutMenuItem_actionPerformed(e)); - jSplitPane2.add(messagesPanel, JSplitPane.BOTTOM); - messagesPanel.add(messagesScrollPane, null); - messagesScrollPane.getViewport().add(messagesTextPane, null); - jSplitPane2.add(jPanel3, JSplitPane.TOP); - jPanel3.add(jScrollPane3, null); - jScrollPane3.getViewport().add(pass1TextPane, null); - jPanel3.add(jScrollPane4, null); - jPanel3.add(jSplitPane3, null); - jSplitPane3.add(jScrollPane2, JSplitPane.LEFT); - jScrollPane2.getViewport().add(pass3aJList, null); - jSplitPane3.add(jScrollPane5, JSplitPane.RIGHT); - jScrollPane5.getViewport().add(pass3aTextPane, null); - jPanel3.add(jSplitPane4, null); - jSplitPane4.add(jScrollPane6, JSplitPane.LEFT); - jScrollPane6.getViewport().add(pass3bJList, null); - jSplitPane4.add(jScrollPane7, JSplitPane.RIGHT); - jScrollPane7.getViewport().add(pass3bTextPane, null); - jScrollPane4.getViewport().add(pass2TextPane, null); - jSplitPane1.add(jPanel2, JSplitPane.TOP); - jPanel2.add(jScrollPane1, null); - jSplitPane1.add(jPanel1, JSplitPane.BOTTOM); - jPanel1.add(jSplitPane2, null); - jScrollPane1.getViewport().add(classNamesJList, null); - jMenuBar1.add(jMenu1); - jMenuBar1.add(jMenu2); - contentPane.add(jSplitPane1, "jSplitPane1"); - jMenu1.add(newFileMenuItem); - jMenu2.add(whatisMenuItem); - jMenu2.add(aboutMenuItem); - jSplitPane2.setDividerLocation(300); - jSplitPane3.setDividerLocation(150); - jSplitPane4.setDividerLocation(150); - } - - - /** Overridden to stop the application on a closing window. */ - @Override - protected void processWindowEvent( final WindowEvent e ) { - super.processWindowEvent(e); - if (e.getID() == WindowEvent.WINDOW_CLOSING) { - System.exit(0); - } - } - - - synchronized void classNamesJList_valueChanged( final ListSelectionEvent e ) { - if (e.getValueIsAdjusting()) { - return; - } - current_class = classNamesJList.getSelectedValue(); - try { - verify(); - } catch (final ClassNotFoundException ex) { - // FIXME: report the error using the GUI - ex.printStackTrace(); - } - classNamesJList.setSelectedValue(current_class, true); - } - - - private void verify() throws ClassNotFoundException { - setTitle("PLEASE WAIT"); - final Verifier v = VerifierFactory.getVerifier(current_class); - v.flush(); // Don't cache the verification result for this class. - VerificationResult vr; - vr = v.doPass1(); - if (vr.getStatus() == VerificationResult.VERIFIED_REJECTED) { - pass1TextPane.setText(vr.getMessage()); - pass1TextPane.setBackground(Color.red); - pass2TextPane.setText(""); - pass2TextPane.setBackground(Color.yellow); - pass3aTextPane.setText(""); - pass3aJList.setListData(new String[0]); - pass3aTextPane.setBackground(Color.yellow); - pass3bTextPane.setText(""); - pass3bJList.setListData(new String[0]); - pass3bTextPane.setBackground(Color.yellow); - } else { // Must be VERIFIED_OK, Pass 1 does not know VERIFIED_NOTYET - pass1TextPane.setBackground(Color.green); - pass1TextPane.setText(vr.getMessage()); - vr = v.doPass2(); - if (vr.getStatus() == VerificationResult.VERIFIED_REJECTED) { - pass2TextPane.setText(vr.getMessage()); - pass2TextPane.setBackground(Color.red); - pass3aTextPane.setText(""); - pass3aTextPane.setBackground(Color.yellow); - pass3aJList.setListData(new String[0]); - pass3bTextPane.setText(""); - pass3bTextPane.setBackground(Color.yellow); - pass3bJList.setListData(new String[0]); - } else { // must be Verified_OK, because Pass1 was OK (cannot be Verified_NOTYET). - pass2TextPane.setText(vr.getMessage()); - pass2TextPane.setBackground(Color.green); - final JavaClass jc = Repository.lookupClass(current_class); - /* - boolean all3aok = true; - boolean all3bok = true; - String all3amsg = ""; - String all3bmsg = ""; - */ - final String[] methodnames = new String[jc.getMethods().length]; - for (int i = 0; i < jc.getMethods().length; i++) { - methodnames[i] = jc.getMethods()[i].toString().replace('\n', ' ').replace('\t', - ' '); - } - pass3aJList.setListData(methodnames); - pass3aJList.setSelectionInterval(0, jc.getMethods().length - 1); - pass3bJList.setListData(methodnames); - pass3bJList.setSelectionInterval(0, jc.getMethods().length - 1); - } - } - final String[] msgs = v.getMessages(); - messagesTextPane.setBackground(msgs.length == 0 ? Color.green : Color.yellow); - final StringBuilder allmsgs = new StringBuilder(); - for (int i = 0; i < msgs.length; i++) { - msgs[i] = msgs[i].replace('\n', ' '); - allmsgs.append(msgs[i]).append("\n\n"); - } - messagesTextPane.setText(allmsgs.toString()); - setTitle(current_class + " - " + JUSTICE_VERSION); - } - - - void newFileMenuItem_actionPerformed( final ActionEvent e ) { - final String classname = JOptionPane - .showInputDialog("Please enter the fully qualified name of a class or interface to verify:"); - if ((classname == null) || (classname.isEmpty())) { - return; - } - VerifierFactory.getVerifier(classname); // let observers do the rest. - classNamesJList.setSelectedValue(classname, true); - } - - - synchronized void pass3aJList_valueChanged( final ListSelectionEvent e ) { - if (e.getValueIsAdjusting()) { - return; - } - final Verifier v = VerifierFactory.getVerifier(current_class); - final StringBuilder all3amsg = new StringBuilder(); - boolean all3aok = true; - boolean rejected = false; - for (int i = 0; i < pass3aJList.getModel().getSize(); i++) { - if (pass3aJList.isSelectedIndex(i)) { - final VerificationResult vr = v.doPass3a(i); - if (vr.getStatus() == VerificationResult.VERIFIED_REJECTED) { - all3aok = false; - rejected = true; - } - JavaClass jc = null; - try { - jc = Repository.lookupClass(v.getClassName()); - all3amsg.append("Method '").append(jc.getMethods()[i]).append("': ") - .append(vr.getMessage().replace('\n', ' ') ).append("\n\n"); - } catch (final ClassNotFoundException ex) { - // FIXME: handle the error - ex.printStackTrace(); - } - } - } - pass3aTextPane.setText(all3amsg.toString()); - pass3aTextPane.setBackground(all3aok ? Color.green : (rejected ? Color.red : Color.yellow)); - } - - - synchronized void pass3bJList_valueChanged( final ListSelectionEvent e ) { - if (e.getValueIsAdjusting()) { - return; - } - final Verifier v = VerifierFactory.getVerifier(current_class); - final StringBuilder all3bmsg = new StringBuilder(); - boolean all3bok = true; - boolean rejected = false; - for (int i = 0; i < pass3bJList.getModel().getSize(); i++) { - if (pass3bJList.isSelectedIndex(i)) { - final VerificationResult vr = v.doPass3b(i); - if (vr.getStatus() == VerificationResult.VERIFIED_REJECTED) { - all3bok = false; - rejected = true; - } - JavaClass jc = null; - try { - jc = Repository.lookupClass(v.getClassName()); - all3bmsg.append("Method '").append(jc.getMethods()[i]).append("': ") - .append(vr.getMessage().replace('\n', ' ')).append("\n\n"); - } catch (final ClassNotFoundException ex) { - // FIXME: handle the error - ex.printStackTrace(); - } - } - } - pass3bTextPane.setText(all3bmsg.toString()); - pass3bTextPane.setBackground(all3bok ? Color.green : (rejected ? Color.red : Color.yellow)); - } - - - void aboutMenuItem_actionPerformed( final ActionEvent e ) { - JOptionPane - .showMessageDialog( - this, - "JustIce is a Java class file verifier.\n"+ - "It was implemented by Enver Haase in 2001, 2002.\n", - JUSTICE_VERSION, JOptionPane.INFORMATION_MESSAGE); - } - - - void whatisMenuItem_actionPerformed( final ActionEvent e ) { - JOptionPane - .showMessageDialog( - this, - "The upper four boxes to the right reflect verification passes according to"+ - " The Java Virtual Machine Specification.\nThese are (in that order):"+ - " Pass one, Pass two, Pass three (before data flow analysis), Pass three (data flow analysis).\n"+ - "The bottom box to the right shows (warning) messages; warnings do not cause a class to be rejected.", - JUSTICE_VERSION, JOptionPane.INFORMATION_MESSAGE); - } - - - /** - * @return the classNamesJList - */ - JList getClassNamesJList() { - return classNamesJList; - } - - -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/VerifierFactory.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/VerifierFactory.java deleted file mode 100644 index 444005e8..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/VerifierFactory.java +++ /dev/null @@ -1,106 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.verifier; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Vector; - -/** - * This class produces instances of the Verifier class. Its purpose is to make - * sure that they are singleton instances with respect to the class name they - * operate on. That means, for every class (represented by a unique fully qualified - * class name) there is exactly one Verifier. - * - * @see Verifier - */ -public class VerifierFactory { - - /** - * The HashMap that holds the data about the already-constructed Verifier instances. - */ - private static final Map hashMap = new HashMap<>(); - /** - * The VerifierFactoryObserver instances that observe the VerifierFactory. - */ - private static final List observers = new Vector<>(); - - - /** - * The VerifierFactory is not instantiable. - */ - private VerifierFactory() { - } - - - /** - * Returns the (only) verifier responsible for the class with the given name. - * Possibly a new Verifier object is transparently created. - * @return the (only) verifier responsible for the class with the given name. - */ - public static Verifier getVerifier( final String fullyQualifiedClassName ) { - Verifier v = hashMap.get(fullyQualifiedClassName); - if (v == null) { - v = new Verifier(fullyQualifiedClassName); - hashMap.put(fullyQualifiedClassName, v); - notify(fullyQualifiedClassName); - } - return v; - } - - - /** - * Notifies the observers of a newly generated Verifier. - */ - private static void notify( final String fullyQualifiedClassName ) { - // notify the observers - for (final VerifierFactoryObserver vfo : observers) { - vfo.update(fullyQualifiedClassName); - } - } - - - /** - * Returns all Verifier instances created so far. - * This is useful when a Verifier recursively lets - * the VerifierFactory create other Verifier instances - * and if you want to verify the transitive hull of - * referenced class files. - */ - public static Verifier[] getVerifiers() { - final Verifier[] vs = new Verifier[hashMap.size()]; - return hashMap.values().toArray(vs); // Because vs is big enough, vs is used to store the values into and returned! - } - - - /** - * Adds the VerifierFactoryObserver o to the list of observers. - */ - public static void attach( final VerifierFactoryObserver o ) { - observers.add(o); - } - - - /** - * Removes the VerifierFactoryObserver o from the list of observers. - */ - public static void detach( final VerifierFactoryObserver o ) { - observers.remove(o); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/VerifierFactoryListModel.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/VerifierFactoryListModel.java deleted file mode 100644 index 2c8ca3ea..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/VerifierFactoryListModel.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.verifier; - -import java.util.ArrayList; -import java.util.List; -import java.util.Set; -import java.util.TreeSet; - -import javax.swing.event.ListDataEvent; -import javax.swing.event.ListDataListener; - -/** - * This class implements an adapter; it implements both a Swing ListModel and a VerifierFactoryObserver. - * - */ -public class VerifierFactoryListModel implements VerifierFactoryObserver, javax.swing.ListModel { - - private final List listeners = new ArrayList<>(); - private final Set cache = new TreeSet<>(); - - public VerifierFactoryListModel() { - VerifierFactory.attach(this); - update(null); // fill cache. - } - - @Override - public synchronized void update(final String s) { - final Verifier[] verifiers = VerifierFactory.getVerifiers(); - final int num_of_verifiers = verifiers.length; - cache.clear(); - for (final Verifier verifier : verifiers) { - cache.add(verifier.getClassName()); - } - for (final ListDataListener listener : listeners) { - final ListDataEvent e = new ListDataEvent(this, ListDataEvent.CONTENTS_CHANGED, 0, num_of_verifiers - 1); - listener.contentsChanged(e); - } - } - - @Override - public synchronized void addListDataListener(final ListDataListener l) { - listeners.add(l); - } - - @Override - public synchronized void removeListDataListener(final javax.swing.event.ListDataListener l) { - listeners.remove(l); - } - - @Override - public synchronized int getSize() { - return cache.size(); - } - - @Override - public synchronized String getElementAt(final int index) { - return cache.toArray(new String[cache.size()])[index]; - } - -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/VerifierFactoryObserver.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/VerifierFactoryObserver.java deleted file mode 100644 index 33beb5c9..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/VerifierFactoryObserver.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.verifier; - -/** - * VerifierFactoryObserver instances are notified when new Verifier - * instances are created. - * - * - * @see VerifierFactory#getVerifier(String) - * @see VerifierFactory#getVerifiers() - * @see VerifierFactory#attach(VerifierFactoryObserver) - * @see VerifierFactory#detach(VerifierFactoryObserver) - */ -public interface VerifierFactoryObserver { - - /** - * VerifierFactoryObserver instances are notified invoking this method. - * The String argument is the fully qualified class name of a class a - * new Verifier instance created by the VerifierFactory operates on. - */ - void update( String s ); -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/VerifyDialog.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/VerifyDialog.java deleted file mode 100644 index d2e198b1..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/VerifyDialog.java +++ /dev/null @@ -1,563 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.bcel.verifier; - -import java.awt.Color; - -import org.apache.bcel.Repository; -import org.apache.bcel.classfile.JavaClass; - -/** - * A class for simple graphical class file verification. - * Use the main(String []) method with fully qualified - * class names as arguments to use it as a stand-alone - * application. - * Use the VerifyDialog(String) constructor to use this - * class in your application. - * [This class was created using VisualAge for Java, - * but it does not work under VAJ itself (Version 3.02 JDK 1.2)] - * @see #main(String[]) - * @see #VerifyDialog(String) - */ -public class VerifyDialog extends javax.swing.JDialog { - - private static final long serialVersionUID = -6374807677043142313L; - /** Machine-generated. */ - private javax.swing.JPanel ivjJDialogContentPane = null; - /** Machine-generated. */ - private javax.swing.JPanel ivjPass1Panel = null; - /** Machine-generated. */ - private javax.swing.JPanel ivjPass2Panel = null; - /** Machine-generated. */ - private javax.swing.JPanel ivjPass3Panel = null; - /** Machine-generated. */ - private javax.swing.JButton ivjPass1Button = null; - /** Machine-generated. */ - private javax.swing.JButton ivjPass2Button = null; - /** Machine-generated. */ - private javax.swing.JButton ivjPass3Button = null; - /** Machine-generated. */ - private final IvjEventHandler ivjEventHandler = new IvjEventHandler(); - /** - * The class to verify. Default set to 'java.lang.Object' - * in case this class is instantiated via one of the many - * machine-generated constructors. - */ - private String class_name = "java.lang.Object"; - /** - * This field is here to count the number of open VerifyDialog - * instances so the JVM can be exited afer every Dialog had been - * closed. - */ - private static int classesToVerify; - - /** Machine-generated. */ - class IvjEventHandler implements java.awt.event.ActionListener { - - @Override - public void actionPerformed( final java.awt.event.ActionEvent e ) { - if (e.getSource() == VerifyDialog.this.getPass1Button()) { - connEtoC1(e); - } - if (e.getSource() == VerifyDialog.this.getPass2Button()) { - connEtoC2(e); - } - if (e.getSource() == VerifyDialog.this.getPass3Button()) { - connEtoC3(e); - } - if (e.getSource() == VerifyDialog.this.getFlushButton()) { - connEtoC4(e); - } - } - } - - /** Machine-generated. */ - private javax.swing.JButton ivjFlushButton = null; - - - /** Machine-generated. */ - public VerifyDialog() { - super(); - initialize(); - } - - - /** Machine-generated. */ - public VerifyDialog(final java.awt.Dialog owner) { - super(owner); - } - - - /** Machine-generated. */ - public VerifyDialog(final java.awt.Dialog owner, final String title) { - super(owner, title); - } - - - /** Machine-generated. */ - public VerifyDialog(final java.awt.Dialog owner, final String title, final boolean modal) { - super(owner, title, modal); - } - - - /** Machine-generated. */ - public VerifyDialog(final java.awt.Dialog owner, final boolean modal) { - super(owner, modal); - } - - - /** Machine-generated. */ - public VerifyDialog(final java.awt.Frame owner) { - super(owner); - } - - - /** Machine-generated. */ - public VerifyDialog(final java.awt.Frame owner, final String title) { - super(owner, title); - } - - - /** Machine-generated. */ - public VerifyDialog(final java.awt.Frame owner, final String title, final boolean modal) { - super(owner, title, modal); - } - - - /** Machine-generated. */ - public VerifyDialog(final java.awt.Frame owner, final boolean modal) { - super(owner, modal); - } - - - /** - * Use this constructor if you want a possibility to verify other - * class files than java.lang.Object. - * @param fully_qualified_class_name java.lang.String - */ - public VerifyDialog(String fully_qualified_class_name) { - super(); - final int dotclasspos = fully_qualified_class_name.lastIndexOf(".class"); - if (dotclasspos != -1) { - fully_qualified_class_name = fully_qualified_class_name.substring(0, dotclasspos); - } - fully_qualified_class_name = fully_qualified_class_name.replace('/', '.'); - class_name = fully_qualified_class_name; - initialize(); - } - - - /** Machine-generated. */ - private void connEtoC1( final java.awt.event.ActionEvent arg1 ) { - try { - // user code begin {1} - // user code end - this.pass1Button_ActionPerformed(arg1); - // user code begin {2} - // user code end - } catch (final java.lang.Throwable ivjExc) { - // user code begin {3} - // user code end - handleException(ivjExc); - } - } - - - /** Machine-generated. */ - private void connEtoC2( final java.awt.event.ActionEvent arg1 ) { - try { - // user code begin {1} - // user code end - this.pass2Button_ActionPerformed(arg1); - // user code begin {2} - // user code end - } catch (final java.lang.Throwable ivjExc) { - // user code begin {3} - // user code end - handleException(ivjExc); - } - } - - - /** Machine-generated. */ - private void connEtoC3( final java.awt.event.ActionEvent arg1 ) { - try { - // user code begin {1} - // user code end - this.pass4Button_ActionPerformed(arg1); - // user code begin {2} - // user code end - } catch (final java.lang.Throwable ivjExc) { - // user code begin {3} - // user code end - handleException(ivjExc); - } - } - - - /** Machine-generated. */ - private void connEtoC4( final java.awt.event.ActionEvent arg1 ) { - try { - // user code begin {1} - // user code end - this.flushButton_ActionPerformed(arg1); - // user code begin {2} - // user code end - } catch (final java.lang.Throwable ivjExc) { - // user code begin {3} - // user code end - handleException(ivjExc); - } - } - - - /** Machine-generated. */ - public void flushButton_ActionPerformed( final java.awt.event.ActionEvent actionEvent ) { - VerifierFactory.getVerifier(class_name).flush(); - Repository.removeClass(class_name); // Make sure it will be reloaded. - getPass1Panel().setBackground(Color.gray); - getPass1Panel().repaint(); - getPass2Panel().setBackground(Color.gray); - getPass2Panel().repaint(); - getPass3Panel().setBackground(Color.gray); - getPass3Panel().repaint(); - } - - - /** Machine-generated. */ - private javax.swing.JButton getFlushButton() { - if (ivjFlushButton == null) { - try { - ivjFlushButton = new javax.swing.JButton(); - ivjFlushButton.setName("FlushButton"); - ivjFlushButton.setText("Flush: Forget old verification results"); - ivjFlushButton.setBackground(java.awt.SystemColor.controlHighlight); - ivjFlushButton.setBounds(60, 215, 300, 30); - ivjFlushButton.setForeground(java.awt.Color.red); - ivjFlushButton.setActionCommand("FlushButton"); - // user code begin {1} - // user code end - } catch (final java.lang.Throwable ivjExc) { - // user code begin {2} - // user code end - handleException(ivjExc); - } - } - return ivjFlushButton; - } - - - /** Machine-generated. */ - private javax.swing.JPanel getJDialogContentPane() { - if (ivjJDialogContentPane == null) { - try { - ivjJDialogContentPane = new javax.swing.JPanel(); - ivjJDialogContentPane.setName("JDialogContentPane"); - ivjJDialogContentPane.setLayout(null); - getJDialogContentPane().add(getPass1Panel(), getPass1Panel().getName()); - getJDialogContentPane().add(getPass3Panel(), getPass3Panel().getName()); - getJDialogContentPane().add(getPass2Panel(), getPass2Panel().getName()); - getJDialogContentPane().add(getPass1Button(), getPass1Button().getName()); - getJDialogContentPane().add(getPass2Button(), getPass2Button().getName()); - getJDialogContentPane().add(getPass3Button(), getPass3Button().getName()); - getJDialogContentPane().add(getFlushButton(), getFlushButton().getName()); - // user code begin {1} - // user code end - } catch (final java.lang.Throwable ivjExc) { - // user code begin {2} - // user code end - handleException(ivjExc); - } - } - return ivjJDialogContentPane; - } - - - /** Machine-generated. */ - private javax.swing.JButton getPass1Button() { - if (ivjPass1Button == null) { - try { - ivjPass1Button = new javax.swing.JButton(); - ivjPass1Button.setName("Pass1Button"); - ivjPass1Button.setText("Pass1: Verify binary layout of .class file"); - ivjPass1Button.setBackground(java.awt.SystemColor.controlHighlight); - ivjPass1Button.setBounds(100, 40, 300, 30); - ivjPass1Button.setActionCommand("Button1"); - // user code begin {1} - // user code end - } catch (final java.lang.Throwable ivjExc) { - // user code begin {2} - // user code end - handleException(ivjExc); - } - } - return ivjPass1Button; - } - - - /** Machine-generated. */ - private javax.swing.JPanel getPass1Panel() { - if (ivjPass1Panel == null) { - try { - ivjPass1Panel = new javax.swing.JPanel(); - ivjPass1Panel.setName("Pass1Panel"); - ivjPass1Panel.setLayout(null); - ivjPass1Panel.setBackground(java.awt.SystemColor.controlShadow); - ivjPass1Panel.setBounds(30, 30, 50, 50); - // user code begin {1} - // user code end - } catch (final java.lang.Throwable ivjExc) { - // user code begin {2} - // user code end - handleException(ivjExc); - } - } - return ivjPass1Panel; - } - - - /** Machine-generated. */ - private javax.swing.JButton getPass2Button() { - if (ivjPass2Button == null) { - try { - ivjPass2Button = new javax.swing.JButton(); - ivjPass2Button.setName("Pass2Button"); - ivjPass2Button.setText("Pass 2: Verify static .class file constraints"); - ivjPass2Button.setBackground(java.awt.SystemColor.controlHighlight); - ivjPass2Button.setBounds(100, 100, 300, 30); - ivjPass2Button.setActionCommand("Button2"); - // user code begin {1} - // user code end - } catch (final java.lang.Throwable ivjExc) { - // user code begin {2} - // user code end - handleException(ivjExc); - } - } - return ivjPass2Button; - } - - - /** Machine-generated. */ - private javax.swing.JPanel getPass2Panel() { - if (ivjPass2Panel == null) { - try { - ivjPass2Panel = new javax.swing.JPanel(); - ivjPass2Panel.setName("Pass2Panel"); - ivjPass2Panel.setLayout(null); - ivjPass2Panel.setBackground(java.awt.SystemColor.controlShadow); - ivjPass2Panel.setBounds(30, 90, 50, 50); - // user code begin {1} - // user code end - } catch (final java.lang.Throwable ivjExc) { - // user code begin {2} - // user code end - handleException(ivjExc); - } - } - return ivjPass2Panel; - } - - - /** Machine-generated. */ - private javax.swing.JButton getPass3Button() { - if (ivjPass3Button == null) { - try { - ivjPass3Button = new javax.swing.JButton(); - ivjPass3Button.setName("Pass3Button"); - ivjPass3Button.setText("Passes 3a+3b: Verify code arrays"); - ivjPass3Button.setBackground(java.awt.SystemColor.controlHighlight); - ivjPass3Button.setBounds(100, 160, 300, 30); - ivjPass3Button.setActionCommand("Button2"); - // user code begin {1} - // user code end - } catch (final java.lang.Throwable ivjExc) { - // user code begin {2} - // user code end - handleException(ivjExc); - } - } - return ivjPass3Button; - } - - - /** Machine-generated. */ - private javax.swing.JPanel getPass3Panel() { - if (ivjPass3Panel == null) { - try { - ivjPass3Panel = new javax.swing.JPanel(); - ivjPass3Panel.setName("Pass3Panel"); - ivjPass3Panel.setLayout(null); - ivjPass3Panel.setBackground(java.awt.SystemColor.controlShadow); - ivjPass3Panel.setBounds(30, 150, 50, 50); - // user code begin {1} - // user code end - } catch (final java.lang.Throwable ivjExc) { - // user code begin {2} - // user code end - handleException(ivjExc); - } - } - return ivjPass3Panel; - } - - - /** Machine-generated. */ - private void handleException( final java.lang.Throwable exception ) { - /* Uncomment the following lines to print uncaught exceptions to stdout */ - System.out.println("--------- UNCAUGHT EXCEPTION ---------"); - exception.printStackTrace(System.out); - // manually added code - if (exception instanceof ThreadDeath) { - throw (ThreadDeath) exception; - } - if (exception instanceof VirtualMachineError) { - throw (VirtualMachineError) exception; - } - } - - - /** Machine-generated. */ - private void initConnections() throws java.lang.Exception { - // user code begin {1} - // user code end - getPass1Button().addActionListener(ivjEventHandler); - getPass2Button().addActionListener(ivjEventHandler); - getPass3Button().addActionListener(ivjEventHandler); - getFlushButton().addActionListener(ivjEventHandler); - } - - - /** Machine-generated. */ - private void initialize() { - try { - // user code begin {1} - // user code end - setName("VerifyDialog"); - setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); - setSize(430, 280); - setVisible(true); - setModal(true); - setResizable(false); - setContentPane(getJDialogContentPane()); - initConnections(); - } catch (final java.lang.Throwable ivjExc) { - handleException(ivjExc); - } - // user code begin {2} - setTitle("'" + class_name + "' verification - JustIce / BCEL"); - // user code end - } - - - /** - * Verifies one or more class files. - * Verification results are presented graphically: Red means 'rejected', - * green means 'passed' while yellow means 'could not be verified yet'. - * @param args java.lang.String[] fully qualified names of classes to verify. - */ - public static void main( final java.lang.String[] args ) { - classesToVerify = args.length; - for (final String arg : args) { - try { - VerifyDialog aVerifyDialog; - aVerifyDialog = new VerifyDialog(arg); - aVerifyDialog.setModal(true); - aVerifyDialog.addWindowListener(new java.awt.event.WindowAdapter() { - - @Override - public void windowClosing( final java.awt.event.WindowEvent e ) { - classesToVerify--; - if (classesToVerify == 0) { - System.exit(0); - } - } - }); - aVerifyDialog.setVisible(true); - } catch (final Throwable exception) { - System.err.println("Exception occurred in main() of javax.swing.JDialog"); - exception.printStackTrace(System.out); - } - } - } - - - /** Machine-generated. */ - public void pass1Button_ActionPerformed( final java.awt.event.ActionEvent actionEvent ) { - final Verifier v = VerifierFactory.getVerifier(class_name); - final VerificationResult vr = v.doPass1(); - if (vr.getStatus() == VerificationResult.VERIFIED_OK) { - getPass1Panel().setBackground(Color.green); - getPass1Panel().repaint(); - } - if (vr.getStatus() == VerificationResult.VERIFIED_REJECTED) { - getPass1Panel().setBackground(Color.red); - getPass1Panel().repaint(); - } - } - - - /** Machine-generated. */ - public void pass2Button_ActionPerformed( final java.awt.event.ActionEvent actionEvent ) { - pass1Button_ActionPerformed(actionEvent); - final Verifier v = VerifierFactory.getVerifier(class_name); - final VerificationResult vr = v.doPass2(); - if (vr.getStatus() == VerificationResult.VERIFIED_OK) { - getPass2Panel().setBackground(Color.green); - getPass2Panel().repaint(); - } - if (vr.getStatus() == VerificationResult.VERIFIED_NOTYET) { - getPass2Panel().setBackground(Color.yellow); - getPass2Panel().repaint(); - } - if (vr.getStatus() == VerificationResult.VERIFIED_REJECTED) { - getPass2Panel().setBackground(Color.red); - getPass2Panel().repaint(); - } - } - - - /** Machine-generated. */ - public void pass4Button_ActionPerformed( final java.awt.event.ActionEvent actionEvent ) { - pass2Button_ActionPerformed(actionEvent); - Color color = Color.green; - final Verifier v = VerifierFactory.getVerifier(class_name); - VerificationResult vr = v.doPass2(); - if (vr.getStatus() == VerificationResult.VERIFIED_OK) { - JavaClass jc = null; - try { - jc = Repository.lookupClass(class_name); - final int nr = jc.getMethods().length; - for (int i = 0; i < nr; i++) { - vr = v.doPass3b(i); - if (vr.getStatus() != VerificationResult.VERIFIED_OK) { - color = Color.red; - break; - } - } - } catch (final ClassNotFoundException ex) { - // FIXME: report the error - ex.printStackTrace(); - } - } else { - color = Color.yellow; - } - getPass3Panel().setBackground(color); - getPass3Panel().repaint(); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/exc/AssertionViolatedException.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/exc/AssertionViolatedException.java deleted file mode 100644 index e671155a..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/exc/AssertionViolatedException.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.verifier.exc; - -import java.util.Arrays; - -/** - * Instances of this class should never be thrown. When such an instance is thrown, - * this is due to an INTERNAL ERROR of BCEL's class file verifier "JustIce". - * - */ -public final class AssertionViolatedException extends RuntimeException{ - private static final long serialVersionUID = -129822266349567409L; - /** The error message. */ - private String detailMessage; - /** Constructs a new AssertionViolatedException with null as its error message string. */ - public AssertionViolatedException() { - super(); - } - /** - * Constructs a new AssertionViolatedException with the specified error message preceded - * by "INTERNAL ERROR: ". - */ - public AssertionViolatedException(String message) { - super(message = "INTERNAL ERROR: "+message); // Thanks to Java, the constructor call here must be first. - detailMessage=message; - } - /** - * Constructs a new AssertionViolationException with the specified error message and initial cause - * @since 6.0 - */ - public AssertionViolatedException(String message, final Throwable initCause) { - super(message = "INTERNAL ERROR: "+message, initCause); - detailMessage=message; - } - /** Extends the error message with a string before ("pre") and after ("post") the - 'old' error message. All of these three strings are allowed to be null, and null - is always replaced by the empty string (""). In particular, after invoking this - method, the error message of this object can no longer be null. - */ - public void extendMessage(String pre, String post) { - if (pre == null) { - pre=""; - } - if (detailMessage == null) { - detailMessage=""; - } - if (post == null) { - post=""; - } - detailMessage = pre+detailMessage+post; - } - /** - * Returns the error message string of this AssertionViolatedException object. - * @return the error message string of this AssertionViolatedException. - */ - @Override - public String getMessage() { - return detailMessage; - } - - /** - * DO NOT USE. It's for experimental testing during development only. - */ - public static void main(final String[] args) { - final AssertionViolatedException ave = new AssertionViolatedException(Arrays.toString(args)); - ave.extendMessage("\nFOUND:\n\t","\nExiting!!\n"); - throw ave; - } - -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/exc/ClassConstraintException.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/exc/ClassConstraintException.java deleted file mode 100644 index e9765dce..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/exc/ClassConstraintException.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.verifier.exc; - - -/** - * Instances of this class are thrown by BCEL's class file verifier "JustIce" - * when a class file to verify does not pass the verification pass 2 as described - * in the Java Virtual Machine specification, 2nd edition. - * - */ -public class ClassConstraintException extends VerificationException{ - private static final long serialVersionUID = -4745598983569128296L; - - /** - * Constructs a new ClassConstraintException with null as its error message string. - */ - public ClassConstraintException() { - super(); - } - - /** - * Constructs a new ClassConstraintException with the specified error message. - */ - public ClassConstraintException(final String message) { - super (message); - } - - /** - * Constructs a new ClassConstraintException with the specified error message and cause - * @since 6.0 - */ - public ClassConstraintException(final String message, final Throwable initCause) { - super(message, initCause); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/exc/CodeConstraintException.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/exc/CodeConstraintException.java deleted file mode 100644 index 558f4738..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/exc/CodeConstraintException.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.verifier.exc; - -/** - * Instances of this class are thrown by BCEL's class file verifier "JustIce" when - * a class file does not pass the verification pass 3. Note that the pass 3 used by - * "JustIce" involves verification that is usually delayed to pass 4. - * - */ -public abstract class CodeConstraintException extends VerificationException{ - private static final long serialVersionUID = -7265388214714996640L; - /** - * Constructs a new CodeConstraintException with null as its error message string. - */ - CodeConstraintException() { - super(); - } - /** - * Constructs a new CodeConstraintException with the specified error message. - */ - CodeConstraintException(final String message) { - super(message); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/exc/InvalidMethodException.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/exc/InvalidMethodException.java deleted file mode 100644 index fa7df4ce..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/exc/InvalidMethodException.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.verifier.exc; - -/** - * Instances of this class are thrown by BCEL's class file verifier "JustIce" - * when the verification of a method is requested that does not exist. - * - */ -public class InvalidMethodException extends RuntimeException{ - - private static final long serialVersionUID = -7060302743724808051L; - - /** Constructs an InvalidMethodException with the specified detail message. */ - public InvalidMethodException(final String message) { - super(message); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/exc/LinkingConstraintException.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/exc/LinkingConstraintException.java deleted file mode 100644 index dc727c73..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/exc/LinkingConstraintException.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.verifier.exc; - -/** - * Instances of this class are thrown by BCEL's class file verifier "JustIce" when - * a class file to verify does not pass the verification pass 3 because of a violation - * of a constraint that is usually only verified at run-time (pass 4). - * The Java Virtual Machine Specification, 2nd edition, states that certain constraints - * are usually verified at run-time for performance reasons (the verification of those - * constraints requires loading in and recursively verifying referenced classes) that - * conceptually belong to pass 3; to be precise, that conceptually belong to the - * data flow analysis of pass 3 (called pass 3b in JustIce). - * These are the checks necessary for resolution: Compare pages 142-143 ("4.9.1 The - * Verification Process") and pages 50-51 ("2.17.3 Linking: Verification, Preparation, - * and Resolution") of the above mentioned book. - * TODO: At this time, this class is not used in JustIce. - * - */ -public class LinkingConstraintException extends StructuralCodeConstraintException{ - - private static final long serialVersionUID = -5239226345026321126L; -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/exc/LoadingException.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/exc/LoadingException.java deleted file mode 100644 index 96791608..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/exc/LoadingException.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.verifier.exc; - - -/** - * When loading a class file, BCEL will throw an instance of LoadingException if - * the class file is malformed; so it is not conforming to the "Pass 1" verification - * process as described in the Java Virtual Machine specification, 2nd. edition. - */ -public class LoadingException extends VerifierConstraintViolatedException{ - - private static final long serialVersionUID = -7911901533049018823L; - - /** - * Constructs a new LoadingException with null as its error message string. - */ - public LoadingException() { - super(); - } - - /** - * Constructs a new LoadingException with the specified error message. - */ - public LoadingException(final String message) { - super (message); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/exc/LocalVariableInfoInconsistentException.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/exc/LocalVariableInfoInconsistentException.java deleted file mode 100644 index 5de3ac37..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/exc/LocalVariableInfoInconsistentException.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.verifier.exc; - - -/** - * A LocalVariableInfoInconsistentException instance is thrown by - * the LocalVariableInfo class when it detects that the information - * it holds is inconsistent; this is normally due to inconsistent - * LocalVariableTable entries in the Code attribute of a certain - * Method object. - * - */ -public class LocalVariableInfoInconsistentException extends ClassConstraintException{ - private static final long serialVersionUID = -2833180480144304190L; - - /** - * Constructs a new LocalVariableInfoInconsistentException with null as its error message string. - */ - public LocalVariableInfoInconsistentException() { - super(); - } - - /** - * Constructs a new LocalVariableInfoInconsistentException with the specified error message. - */ - public LocalVariableInfoInconsistentException(final String message) { - super (message); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/exc/StaticCodeConstraintException.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/exc/StaticCodeConstraintException.java deleted file mode 100644 index 2484bd54..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/exc/StaticCodeConstraintException.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.verifier.exc; - - -/** - * Instances of this class are thrown by BCEL's class file verifier "JustIce" when - * a class file to verify does not pass the verification pass 3 because of a violation - * of a static constraint as described in the Java Virtual Machine Specification, - * 2nd edition, 4.8.1, pages 133-137. The static constraints checking part of pass 3 - * is called pass 3a in JustIce. - * - */ -public abstract class StaticCodeConstraintException extends CodeConstraintException{ - private static final long serialVersionUID = 3858523065007725128L; - - public StaticCodeConstraintException(final String message) { - super(message); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/exc/StaticCodeInstructionConstraintException.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/exc/StaticCodeInstructionConstraintException.java deleted file mode 100644 index 819a4b08..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/exc/StaticCodeInstructionConstraintException.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.verifier.exc; - - -/** - * Instances of this class are thrown by BCEL's class file verifier "JustIce" when - * a class file to verify does not pass the verification pass 3 because of a violation - * of a static constraint as described in the Java Virtual Machine Specification, - * Second edition, 4.8.1, pages 133-137. The static constraints checking part of pass 3 - * is called pass 3a in JustIce. - * Static constraints on the instructions in the code array are checked early in - * pass 3a and are described on page 134 in the Java Virtual Machine Specification, - * Second Edition. - * - */ -public class StaticCodeInstructionConstraintException extends StaticCodeConstraintException{ - private static final long serialVersionUID = 4987255974346614794L; - - public StaticCodeInstructionConstraintException(final String message) { - super(message); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/exc/StaticCodeInstructionOperandConstraintException.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/exc/StaticCodeInstructionOperandConstraintException.java deleted file mode 100644 index 9b538aa3..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/exc/StaticCodeInstructionOperandConstraintException.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.verifier.exc; - - -/** - * Instances of this class are thrown by BCEL's class file verifier "JustIce" when - * a class file to verify does not pass the verification pass 3 because of a violation - * of a static constraint as described in the Java Virtual Machine Specification, - * Second edition, 4.8.1, pages 133-137. The static constraints checking part of pass 3 - * is called pass 3a in JustIce. - * Static constraints on the operands of instructions in the code array are checked late in - * pass 3a and are described on page 134-137 in the Java Virtual Machine Specification, - * Second Edition. - * - */ -public class StaticCodeInstructionOperandConstraintException extends StaticCodeConstraintException{ - private static final long serialVersionUID = 4780787099381933487L; - - public StaticCodeInstructionOperandConstraintException(final String message) { - super(message); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/exc/StructuralCodeConstraintException.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/exc/StructuralCodeConstraintException.java deleted file mode 100644 index 3c29d9bf..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/exc/StructuralCodeConstraintException.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.verifier.exc; - -/** - * Instances of this class are thrown by BCEL's class file verifier "JustIce" when - * a class file to verify does not pass the verification pass 3 because of a violation - * of a structural constraint as described in the Java Virtual Machine Specification, - * 2nd edition, 4.8.2, pages 137-139. - * Note that the notion of a "structural" constraint is somewhat misleading. Structural - * constraints are constraints on relationships between Java virtual machine instructions. - * These are the constraints where data-flow analysis is needed to verify if they hold. - * The data flow analysis of pass 3 is called pass 3b in JustIce. - * - */ -public class StructuralCodeConstraintException extends CodeConstraintException{ - private static final long serialVersionUID = 5406842000007181420L; - /** - * Constructs a new StructuralCodeConstraintException with the specified error message. - */ - public StructuralCodeConstraintException(final String message) { - super(message); - } - /** - * Constructs a new StructuralCodeConstraintException with null as its error message string. - */ - public StructuralCodeConstraintException() { - super(); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/exc/Utility.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/exc/Utility.java deleted file mode 100644 index d77a1f54..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/exc/Utility.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.verifier.exc; - - -import java.io.PrintWriter; -import java.io.StringWriter; - -/** - * A utility class providing convenience methods concerning Throwable instances. - * @see java.lang.Throwable - */ -public final class Utility{ - /** This class is not instantiable. */ - private Utility() {} - - /** This method returns the stack trace of a Throwable instance as a String. */ - public static String getStackTrace(final Throwable t) { - final StringWriter sw = new StringWriter(); - final PrintWriter pw = new PrintWriter(sw); - t.printStackTrace(pw); - return sw.toString(); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/exc/VerificationException.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/exc/VerificationException.java deleted file mode 100644 index a66878f8..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/exc/VerificationException.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.verifier.exc; - - -/** - * Instances of this class are thrown by BCEL's class file verifier "JustIce" when a - * class file to verify does not pass one of the verification passes 2 or 3. - * Note that the pass 3 used by "JustIce" involves verification that is usually - * delayed to pass 4. - * The name of this class is justified by the Java Virtual Machine Specification, 2nd - * edition, page 164, 5.4.1 where verification as a part of the linking process is - * defined to be the verification happening in passes 2 and 3. - * - */ -public abstract class VerificationException extends VerifierConstraintViolatedException{ - private static final long serialVersionUID = 8012776320318623652L; - - /** - * Constructs a new VerificationException with null as its error message string. - */ - VerificationException() { - super(); - } - /** - * Constructs a new VerificationException with the specified error message. - */ - VerificationException(final String message) { - super(message); - } - - /** - * Constructs a new VerificationException with the specified error message and exception - */ - VerificationException(final String message, final Throwable initCause) { - super(message, initCause); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/exc/VerifierConstraintViolatedException.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/exc/VerifierConstraintViolatedException.java deleted file mode 100644 index d2f24f45..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/exc/VerifierConstraintViolatedException.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.verifier.exc; - - -/** - * Instances of this class are thrown by BCEL's class file verifier "JustIce" - * whenever - * verification proves that some constraint of a class file (as stated in the - * Java Virtual Machine Specification, Edition 2) is violated. - * This is roughly equivalent to the VerifyError the JVM-internal verifiers - * throw. - * - */ -public abstract class VerifierConstraintViolatedException extends RuntimeException{ - // /** The name of the offending class that did not pass the verifier. */ - // String name_of_offending_class; - - private static final long serialVersionUID = 2946136970490179465L; - /** The specified error message. */ - private String detailMessage; - /** - * Constructs a new VerifierConstraintViolatedException with null as its error message string. - */ - VerifierConstraintViolatedException() { - super(); - } - /** - * Constructs a new VerifierConstraintViolatedException with the specified error message. - */ - VerifierConstraintViolatedException(final String message) { - super(message); // Not that important - detailMessage = message; - } - /** - * Constructs a new VerifierConstraintViolationException with the specified error message and cause - */ - VerifierConstraintViolatedException(final String message, final Throwable initCause) { - super(message, initCause); - detailMessage = message; - } - - - /** Extends the error message with a string before ("pre") and after ("post") the - 'old' error message. All of these three strings are allowed to be null, and null - is always replaced by the empty string (""). In particular, after invoking this - method, the error message of this object can no longer be null. - */ - public void extendMessage(String pre, String post) { - if (pre == null) { - pre=""; - } - if (detailMessage == null) { - detailMessage=""; - } - if (post == null) { - post=""; - } - detailMessage = pre+detailMessage+post; - } - /** - * Returns the error message string of this VerifierConstraintViolatedException object. - * @return the error message string of this VerifierConstraintViolatedException. - */ - @Override - public String getMessage() { - return detailMessage; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/exc/package.html b/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/exc/package.html deleted file mode 100644 index b6c26679..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/exc/package.html +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - -Exception classes used by JustIce, mostly used internally. You don't need to bother with them. - -

Package Specification

- -Contained in this package are Exception classes for use with the JustIce verifier. - - - diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/package.html b/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/package.html deleted file mode 100644 index 5f599ab3..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/package.html +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - -BCEL's verifier JustIce is there to help you dump correct Java class files created or modified with BCEL. - -

Package Specification

- -This is the top-level package of the JustIce verifier. To actually use it, have a look at the VerifierFactory and -Verifier classes. - - - diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/statics/DOUBLE_Upper.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/statics/DOUBLE_Upper.java deleted file mode 100644 index 1874e512..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/statics/DOUBLE_Upper.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.verifier.statics; - - -import org.apache.bcel.Const; -import org.apache.bcel.generic.Type; - -/** - * This class represents the upper half of a DOUBLE variable. - */ -public final class DOUBLE_Upper extends Type{ - - /** The one and only instance of this class. */ - private static final DOUBLE_Upper singleton = new DOUBLE_Upper(); - - /** The constructor; this class must not be instantiated from the outside. */ - private DOUBLE_Upper() { - super(Const.T_UNKNOWN, "Double_Upper"); - } - - /** - * Gets the single instance of this class. - * - * @return the single instance of this class. - */ - public static DOUBLE_Upper theInstance() { - return singleton; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/statics/IntList.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/statics/IntList.java deleted file mode 100644 index c70fbad1..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/statics/IntList.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.verifier.statics; - - -import java.util.ArrayList; -import java.util.List; - -/** - * A small utility class representing a set of basic int values. - * - */ -public class IntList{ - /** The int are stored as Integer objects here. */ - private final List theList; - /** This constructor creates an empty list. */ - IntList() { - theList = new ArrayList<>(); - } - /** Adds an element to the list. */ - void add(final int i) { - theList.add(Integer.valueOf(i)); - } - /** Checks if the specified int is already in the list. */ - boolean contains(final int i) { - final Integer[] ints = new Integer[theList.size()]; - theList.toArray(ints); - for (final Integer k : ints) { - if (i == k.intValue()) { - return true; - } - } - return false; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/statics/LONG_Upper.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/statics/LONG_Upper.java deleted file mode 100644 index b0a27b24..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/statics/LONG_Upper.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.verifier.statics; - - -import org.apache.bcel.Const; -import org.apache.bcel.generic.Type; - -/** - * This class represents the upper half of a LONG variable. - */ -public final class LONG_Upper extends Type{ - - /** The one and only instance of this class. */ - private static final LONG_Upper singleton = new LONG_Upper(); - - /** The constructor; this class must not be instantiated from the outside. */ - private LONG_Upper() { - super(Const.T_UNKNOWN, "Long_Upper"); - } - - /** - * Gets the single instance of this class. - * - * @return the single instance of this class. - */ - public static LONG_Upper theInstance() { - return singleton; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/statics/LocalVariableInfo.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/statics/LocalVariableInfo.java deleted file mode 100644 index 3db76d68..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/statics/LocalVariableInfo.java +++ /dev/null @@ -1,120 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.verifier.statics; - - -import java.util.Hashtable; - -import org.apache.bcel.generic.Type; -import org.apache.bcel.verifier.exc.LocalVariableInfoInconsistentException; - -/** - * A utility class holding the information about - * the name and the type of a local variable in - * a given slot (== index). This information - * often changes in course of byte code offsets. - */ -public class LocalVariableInfo{ - - /** The types database. KEY: String representing the offset integer. */ - private final Hashtable types = new Hashtable<>(); - - /** The names database. KEY: String representing the offset integer. */ - private final Hashtable names = new Hashtable<>(); - - /** - * Adds a name of a local variable and a certain slot to our 'names' - * (Hashtable) database. - */ - private void setName(final int offset, final String name) { - names.put(Integer.toString(offset), name); - } - - /** - * Adds a type of a local variable and a certain slot to our 'types' - * (Hashtable) database. - */ - private void setType(final int offset, final Type t) { - types.put(Integer.toString(offset), t); - } - - /** - * Returns the type of the local variable that uses this local variable slot at the given bytecode offset. Care for - * legal bytecode offsets yourself, otherwise the return value might be wrong. May return 'null' if nothing is known - * about the type of this local variable slot at the given bytecode offset. - * - * @param offset bytecode offset. - * @return the type of the local variable that uses this local variable slot at the given bytecode offset. - */ - public Type getType(final int offset) { - return types.get(Integer.toString(offset)); - } - - /** - * Returns the name of the local variable that uses this local variable slot at the given bytecode offset. Care for - * legal bytecode offsets yourself, otherwise the return value might be wrong. May return 'null' if nothing is known - * about the type of this local variable slot at the given bytecode offset. - * - * @param offset bytecode offset. - * @return the name of the local variable that uses this local variable slot at the given bytecode offset. - */ - public String getName(final int offset) { - return names.get(Integer.toString(offset)); - } - - /** - * Adds some information about this local variable (slot). - * - * @param name variable name - * @param startPc Range in which the variable is valid. - * @param length length of ... - * @param type variable type - * - * @throws LocalVariableInfoInconsistentException if the new information conflicts - * with already gathered information. - */ - public void add(final String name, final int startPc, final int length, final Type type) - throws LocalVariableInfoInconsistentException { - for (int i = startPc; i <= startPc + length; i++) { // incl/incl-notation! - add(i, name, type); - } - } - - /** - * Adds information about name and type for a given offset. - * - * @throws LocalVariableInfoInconsistentException if the new information conflicts - * with already gathered information. - */ - private void add(final int offset, final String name, final Type t) throws LocalVariableInfoInconsistentException { - if (getName(offset) != null) { - if (!getName(offset).equals(name)) { - throw new LocalVariableInfoInconsistentException("At bytecode offset '" + offset - + "' a local variable has two different names: '" + getName(offset) + "' and '" + name + "'."); - } - } - if (getType(offset) != null) { - if (!getType(offset).equals(t)) { - throw new LocalVariableInfoInconsistentException("At bytecode offset '" + offset - + "' a local variable has two different types: '" + getType(offset) + "' and '" + t + "'."); - } - } - setName(offset, name); - setType(offset, t); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/statics/LocalVariablesInfo.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/statics/LocalVariablesInfo.java deleted file mode 100644 index 069efa67..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/statics/LocalVariablesInfo.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.verifier.statics; - - -import org.apache.bcel.generic.Type; -import org.apache.bcel.verifier.exc.AssertionViolatedException; -import org.apache.bcel.verifier.exc.LocalVariableInfoInconsistentException; - -/** - * A utility class holding the information about - * the names and the types of the local variables in - * a given method. - */ -public class LocalVariablesInfo{ - - /** The information about the local variables is stored here. */ - private final LocalVariableInfo[] localVariableInfos; - - /** The constructor. */ - LocalVariablesInfo(final int max_locals) { - localVariableInfos = new LocalVariableInfo[max_locals]; - for (int i=0; i= localVariableInfos.length) { - throw new AssertionViolatedException("Slot number for local variable information out of range."); - } - return localVariableInfos[slot]; - } - - /** - * Adds information about the local variable in slot 'slot'. Automatically - * adds information for slot+1 if 't' is Type.LONG or Type.DOUBLE. - * - * @param name variable name - * @param startPc Range in which the variable is valid. - * @param length length of ... - * @param type variable type - * @throws LocalVariableInfoInconsistentException if the new information conflicts - * with already gathered information. - */ - public void add(final int slot, final String name, final int startPc, final int length, final Type type) throws LocalVariableInfoInconsistentException{ - // The add operation on LocalVariableInfo may throw the '...Inconsistent...' exception, we don't throw it explicitely here. - - if (slot < 0 || slot >= localVariableInfos.length) { - throw new AssertionViolatedException("Slot number for local variable information out of range."); - } - - localVariableInfos[slot].add(name, startPc, length, type); - if (type == Type.LONG) { - localVariableInfos[slot+1].add(name, startPc, length, LONG_Upper.theInstance()); - } - if (type == Type.DOUBLE) { - localVariableInfos[slot+1].add(name, startPc, length, DOUBLE_Upper.theInstance()); - } - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/statics/Pass1Verifier.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/statics/Pass1Verifier.java deleted file mode 100644 index 8e87ee3c..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/statics/Pass1Verifier.java +++ /dev/null @@ -1,199 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.verifier.statics; - - -import org.apache.bcel.Repository; -import org.apache.bcel.classfile.ClassFormatException; -import org.apache.bcel.classfile.JavaClass; -import org.apache.bcel.verifier.PassVerifier; -import org.apache.bcel.verifier.VerificationResult; -import org.apache.bcel.verifier.Verifier; -import org.apache.bcel.verifier.exc.LoadingException; -import org.apache.bcel.verifier.exc.Utility; - -/** - * This PassVerifier verifies a class file according to pass 1 as - * described in The Java Virtual Machine Specification, 2nd edition. - * More detailed information is to be found at the do_verify() method's - * documentation. - * - * @see #do_verify() - */ -public final class Pass1Verifier extends PassVerifier{ - /** - * DON'T USE THIS EVEN PRIVATELY! USE getJavaClass() INSTEAD. - * @see #getJavaClass() - */ - private JavaClass jc; - - /** - * The Verifier that created this. - */ - private final Verifier myOwner; - - /** - * Used to load in and return the myOwner-matching JavaClass object when needed. - * Avoids loading in a class file when it's not really needed! - */ - private JavaClass getJavaClass() { - if (jc == null) { - try { - jc = Repository.lookupClass(myOwner.getClassName()); - } catch (final ClassNotFoundException e) { - // FIXME: currently, Pass1Verifier treats jc == null as a special - // case, so we don't need to do anything here. A better solution - // would be to simply throw the ClassNotFoundException - // out of this method. - } - } - return jc; - } - - /** - * Should only be instantiated by a Verifier. - * - * @see Verifier - */ - public Pass1Verifier(final Verifier owner) { - myOwner = owner; - } - - /** - * Pass-one verification basically means loading in a class file. - * The Java Virtual Machine Specification is not too precise about - * what makes the difference between passes one and two. - * The answer is that only pass one is performed on a class file as - * long as its resolution is not requested; whereas pass two and - * pass three are performed during the resolution process. - * Only four constraints to be checked are explicitly stated by - * The Java Virtual Machine Specification, 2nd edition: - *
    - *
  • The first four bytes must contain the right magic number (0xCAFEBABE). - *
  • All recognized attributes must be of the proper length. - *
  • The class file must not be truncated or have extra bytes at the end. - *
  • The constant pool must not contain any superficially unrecognizable information. - *
- * A more in-depth documentation of what pass one should do was written by - * Philip W. L. Fong: - *
    - *
  • the file should not be truncated. - *
  • the file should not have extra bytes at the end. - *
  • all variable-length structures should be well-formatted: - *
      - *
    • there should only be constant_pool_count-1 many entries in the constant pool. - *
    • all constant pool entries should have size the same as indicated by their type tag. - *
    • there are exactly interfaces_count many entries in the interfaces array of the class file. - *
    • there are exactly fields_count many entries in the fields array of the class file. - *
    • there are exactly methods_count many entries in the methods array of the class file. - *
    • there are exactly attributes_count many entries in the attributes array of the class file, - * fields, methods, and code attribute. - *
    • there should be exactly attribute_length many bytes in each attribute. - * Inconsistency between attribute_length and the actually size of the attribute content should be uncovered. - * For example, in an Exceptions attribute, the actual number of exceptions as required by the number_of_exceptions field - * might yeild an attribute size that doesn't match the attribute_length. Such an anomaly should be detected. - *
    • all attributes should have proper length. In particular, under certain context (e.g. while parsing method_info), - * recognizable attributes (e.g. "Code" attribute) should have correct format (e.g. attribute_length is 2). - *
    - *
  • Also, certain constant values are checked for validity: - *
      - *
    • The magic number should be 0xCAFEBABE. - *
    • The major and minor version numbers are valid. - *
    • All the constant pool type tags are recognizable. - *
    • All undocumented access flags are masked off before use. Strictly speaking, this is not really a check. - *
    • The field this_class should point to a string that represents a legal non-array class name, - * and this name should be the same as the class file being loaded. - *
    • the field super_class should point to a string that represents a legal non-array class name. - *
    • Because some of the above checks require cross referencing the constant pool entries, - * guards are set up to make sure that the referenced entries are of the right type and the indices - * are within the legal range (0 < index < constant_pool_count). - *
    - *
  • Extra checks done in pass 1: - *
      - *
    • the constant values of static fields should have the same type as the fields. - *
    • the number of words in a parameter list does not exceed 255 and locals_max. - *
    • the name and signature of fields and methods are verified to be of legal format. - *
    - *
- * (From the Paper - * The Mysterious Pass One, first draft, September 2, 1997.) - * - *

However, most of this is done by parsing a class file or generating a class file into BCEL's internal data structure. - * Therefore, all that is really done here is look up the class file from BCEL's repository. - * This is also motivated by the fact that some omitted things - * (like the check for extra bytes at the end of the class file) are handy when actually using BCEL to repair a class file - * (otherwise you would not be able to load it into BCEL).

- * - * @see org.apache.bcel.Repository - * @see org.apache.bcel.Const#JVM_CLASSFILE_MAGIC - */ - @Override - public VerificationResult do_verify() { - JavaClass jc; - try{ - jc = getJavaClass(); //loads in the class file if not already done. - - if (jc != null) { - /* If we find more constraints to check, we should do this in an own method. */ - if (! myOwner.getClassName().equals(jc.getClassName())) { - // This should maybe caught by BCEL: In case of renamed .class files we get wrong - // JavaClass objects here. - throw new LoadingException("Wrong name: the internal name of the .class file '"+jc.getClassName()+ - "' does not match the file's name '"+myOwner.getClassName()+"'."); - } - } - - } - catch(final LoadingException e) { - return new VerificationResult(VerificationResult.VERIFIED_REJECTED, e.getMessage()); - } - catch(final ClassFormatException e) { - return new VerificationResult(VerificationResult.VERIFIED_REJECTED, e.getMessage()); - } - catch(final RuntimeException e) { - // BCEL does not catch every possible RuntimeException; e.g. if - // a constant pool index is referenced that does not exist. - return new VerificationResult(VerificationResult.VERIFIED_REJECTED, "Parsing via BCEL did not succeed. "+ - e.getClass().getName()+" occured:\n"+Utility.getStackTrace(e)); - } - - if (jc != null) { - return VerificationResult.VR_OK; - } - //TODO: Maybe change Repository's behavior to throw a LoadingException instead of just returning "null" - // if a class file cannot be found or in another way be looked up. - return new VerificationResult(VerificationResult.VERIFIED_REJECTED, "Repository.lookup() failed. FILE NOT FOUND?"); - } - - /** - * Currently this returns an empty array of String. - * One could parse the error messages of BCEL - * (written to java.lang.System.err) when loading - * a class file such as detecting unknown attributes - * or trailing garbage at the end of a class file. - * However, Markus Dahm does not like the idea so this - * method is currently useless and therefore marked as - * TODO. - */ - @Override - public String[] getMessages() { - // This method is only here to override the javadoc-comment. - return super.getMessages(); - } - -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/statics/Pass2Verifier.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/statics/Pass2Verifier.java deleted file mode 100644 index 3268f62e..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/statics/Pass2Verifier.java +++ /dev/null @@ -1,1574 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.verifier.statics; - - -import java.util.HashMap; -import java.util.HashSet; -import java.util.Locale; -import java.util.Map; -import java.util.Set; - -import org.apache.bcel.Const; -import org.apache.bcel.Constants; -import org.apache.bcel.Repository; -import org.apache.bcel.classfile.Attribute; -import org.apache.bcel.classfile.ClassFormatException; -import org.apache.bcel.classfile.Code; -import org.apache.bcel.classfile.CodeException; -import org.apache.bcel.classfile.Constant; -import org.apache.bcel.classfile.ConstantClass; -import org.apache.bcel.classfile.ConstantDouble; -import org.apache.bcel.classfile.ConstantFieldref; -import org.apache.bcel.classfile.ConstantFloat; -import org.apache.bcel.classfile.ConstantInteger; -import org.apache.bcel.classfile.ConstantInterfaceMethodref; -import org.apache.bcel.classfile.ConstantLong; -import org.apache.bcel.classfile.ConstantMethodref; -import org.apache.bcel.classfile.ConstantNameAndType; -import org.apache.bcel.classfile.ConstantPool; -import org.apache.bcel.classfile.ConstantString; -import org.apache.bcel.classfile.ConstantUtf8; -import org.apache.bcel.classfile.ConstantValue; -import org.apache.bcel.classfile.Deprecated; -import org.apache.bcel.classfile.DescendingVisitor; -import org.apache.bcel.classfile.EmptyVisitor; -import org.apache.bcel.classfile.ExceptionTable; -import org.apache.bcel.classfile.Field; -import org.apache.bcel.classfile.InnerClass; -import org.apache.bcel.classfile.InnerClasses; -import org.apache.bcel.classfile.JavaClass; -import org.apache.bcel.classfile.LineNumber; -import org.apache.bcel.classfile.LineNumberTable; -import org.apache.bcel.classfile.LocalVariable; -import org.apache.bcel.classfile.LocalVariableTable; -import org.apache.bcel.classfile.Method; -import org.apache.bcel.classfile.Node; -import org.apache.bcel.classfile.SourceFile; -import org.apache.bcel.classfile.Synthetic; -import org.apache.bcel.classfile.Unknown; -import org.apache.bcel.generic.ArrayType; -import org.apache.bcel.generic.ObjectType; -import org.apache.bcel.generic.Type; -import org.apache.bcel.verifier.PassVerifier; -import org.apache.bcel.verifier.VerificationResult; -import org.apache.bcel.verifier.Verifier; -import org.apache.bcel.verifier.VerifierFactory; -import org.apache.bcel.verifier.exc.AssertionViolatedException; -import org.apache.bcel.verifier.exc.ClassConstraintException; -import org.apache.bcel.verifier.exc.LocalVariableInfoInconsistentException; - -/** - * This PassVerifier verifies a class file according to - * pass 2 as described in The Java Virtual Machine - * Specification, 2nd edition. - * More detailed information is to be found at the do_verify() - * method's documentation. - * - * @see #do_verify() - */ -public final class Pass2Verifier extends PassVerifier implements Constants { - - /** - * The LocalVariableInfo instances used by Pass3bVerifier. - * localVariablesInfos[i] denotes the information for the - * local variables of method number i in the - * JavaClass this verifier operates on. - */ - private LocalVariablesInfo[] localVariablesInfos; - - /** The Verifier that created this. */ - private final Verifier myOwner; - - /** - * Should only be instantiated by a Verifier. - * - * @see Verifier - */ - public Pass2Verifier(final Verifier owner) { - myOwner = owner; - } - - /** - * Returns a LocalVariablesInfo object containing information - * about the usage of the local variables in the Code attribute - * of the said method or null if the class file this - * Pass2Verifier operates on could not be pass-2-verified correctly. - * The method number method_nr is the method you get using - * Repository.lookupClass(myOwner.getClassname()).getMethods()[method_nr];. - * You should not add own information. Leave that to JustIce. - */ - public LocalVariablesInfo getLocalVariablesInfo(final int methodNr) { - if (this.verify() != VerificationResult.VR_OK) { - return null; // It's cached, don't worry. - } - if (methodNr < 0 || methodNr >= localVariablesInfos.length) { - throw new AssertionViolatedException("Method number out of range."); - } - return localVariablesInfos[methodNr]; - } - - /** - * Pass 2 is the pass where static properties of the - * class file are checked without looking into "Code" - * arrays of methods. - * This verification pass is usually invoked when - * a class is resolved; and it may be possible that - * this verification pass has to load in other classes - * such as superclasses or implemented interfaces. - * Therefore, Pass 1 is run on them.
- * Note that most referenced classes are not loaded - * in for verification or for an existance check by this - * pass; only the syntactical correctness of their names - * and descriptors (a.k.a. signatures) is checked.
- * Very few checks that conceptually belong here - * are delayed until pass 3a in JustIce. JustIce does - * not only check for syntactical correctness but also - * for semantical sanity - therefore it needs access to - * the "Code" array of methods in a few cases. Please - * see the pass 3a documentation, too. - * - * @see Pass3aVerifier - */ - @Override - public VerificationResult do_verify() { - try { - final VerificationResult vr1 = myOwner.doPass1(); - if (vr1.equals(VerificationResult.VR_OK)) { - - // For every method, we could have information about the local variables out of LocalVariableTable attributes of - // the Code attributes. - localVariablesInfos = new LocalVariablesInfo[Repository.lookupClass(myOwner.getClassName()).getMethods().length]; - - VerificationResult vr = VerificationResult.VR_OK; // default. - try{ - constant_pool_entries_satisfy_static_constraints(); - field_and_method_refs_are_valid(); - every_class_has_an_accessible_superclass(); - final_methods_are_not_overridden(); - } - catch (final ClassConstraintException cce) { - vr = new VerificationResult(VerificationResult.VERIFIED_REJECTED, cce.getMessage()); - } - return vr; - } - return VerificationResult.VR_NOTYET; - - } catch (final ClassNotFoundException e) { - // FIXME: this might not be the best way to handle missing classes. - throw new AssertionViolatedException("Missing class: " + e, e); - } - } - - /** - * Ensures that every class has a super class and that - * final classes are not subclassed. - * This means, the class this Pass2Verifier operates - * on has proper super classes (transitively) up to - * java.lang.Object. - * The reason for really loading (and Pass1-verifying) - * all of those classes here is that we need them in - * Pass2 anyway to verify no final methods are overridden - * (that could be declared anywhere in the ancestor hierarchy). - * - * @throws ClassConstraintException otherwise. - */ - private void every_class_has_an_accessible_superclass() { - try { - final Set hs = new HashSet<>(); // save class names to detect circular inheritance - JavaClass jc = Repository.lookupClass(myOwner.getClassName()); - int supidx = -1; - - while (supidx != 0) { - supidx = jc.getSuperclassNameIndex(); - - if (supidx == 0) { - if (jc != Repository.lookupClass(Type.OBJECT.getClassName())) { - throw new ClassConstraintException("Superclass of '"+jc.getClassName()+ - "' missing but not "+Type.OBJECT.getClassName()+" itself!"); - } - } - else{ - final String supername = jc.getSuperclassName(); - if (! hs.add(supername)) { // If supername already is in the list - throw new ClassConstraintException("Circular superclass hierarchy detected."); - } - final Verifier v = VerifierFactory.getVerifier(supername); - final VerificationResult vr = v.doPass1(); - - if (vr != VerificationResult.VR_OK) { - throw new ClassConstraintException("Could not load in ancestor class '"+supername+"'."); - } - jc = Repository.lookupClass(supername); - - if (jc.isFinal()) { - throw new ClassConstraintException("Ancestor class '"+supername+ - "' has the FINAL access modifier and must therefore not be subclassed."); - } - } - } - - } catch (final ClassNotFoundException e) { - // FIXME: this might not be the best way to handle missing classes. - throw new AssertionViolatedException("Missing class: " + e, e); - } - } - - /** - * Ensures that final methods are not overridden. - * Precondition to run this method: - * constant_pool_entries_satisfy_static_constraints() and - * every_class_has_an_accessible_superclass() have to be invoked before - * (in that order). - * - * @throws ClassConstraintException otherwise. - * @see #constant_pool_entries_satisfy_static_constraints() - * @see #every_class_has_an_accessible_superclass() - */ - private void final_methods_are_not_overridden() { - try { - final Map hashmap = new HashMap<>(); - JavaClass jc = Repository.lookupClass(myOwner.getClassName()); - - int supidx = -1; - while (supidx != 0) { - supidx = jc.getSuperclassNameIndex(); - - final Method[] methods = jc.getMethods(); - for (final Method method : methods) { - final String nameAndSig = method.getName() + method.getSignature(); - - if (hashmap.containsKey(nameAndSig)) { - if (method.isFinal()) { - if (!(method.isPrivate())) { - throw new ClassConstraintException("Method '" + nameAndSig + "' in class '" + hashmap.get(nameAndSig) + - "' overrides the final (not-overridable) definition in class '" + jc.getClassName() + "'."); - } - addMessage("Method '" + nameAndSig + "' in class '" + hashmap.get(nameAndSig) + - "' overrides the final (not-overridable) definition in class '" + jc.getClassName() + - "'. This is okay, as the original definition was private; however this constraint leverage"+ - " was introduced by JLS 8.4.6 (not vmspec2) and the behavior of the Sun verifiers."); - } else { - if (!method.isStatic()) { // static methods don't inherit - hashmap.put(nameAndSig, jc.getClassName()); - } - } - } else { - if (!method.isStatic()) { // static methods don't inherit - hashmap.put(nameAndSig, jc.getClassName()); - } - } - } - - jc = Repository.lookupClass(jc.getSuperclassName()); - // Well, for OBJECT this returns OBJECT so it works (could return anything but must not throw an Exception). - } - - } catch (final ClassNotFoundException e) { - // FIXME: this might not be the best way to handle missing classes. - throw new AssertionViolatedException("Missing class: " + e, e); - } - - } - - /** - * Ensures that the constant pool entries satisfy the static constraints - * as described in The Java Virtual Machine Specification, 2nd Edition. - * - * @throws ClassConstraintException otherwise. - */ - private void constant_pool_entries_satisfy_static_constraints() { - try { - // Most of the consistency is handled internally by BCEL; here - // we only have to verify if the indices of the constants point - // to constants of the appropriate type and such. - final JavaClass jc = Repository.lookupClass(myOwner.getClassName()); - new CPESSC_Visitor(jc); // constructor implicitly traverses jc - - } catch (final ClassNotFoundException e) { - // FIXME: this might not be the best way to handle missing classes. - throw new AssertionViolatedException("Missing class: " + e, e); - } - } - - /** - * A Visitor class that ensures the constant pool satisfies the static - * constraints. - * The visitXXX() methods throw ClassConstraintException instances otherwise. - * - * @see #constant_pool_entries_satisfy_static_constraints() - */ - private final class CPESSC_Visitor extends org.apache.bcel.classfile.EmptyVisitor{ - private final Class CONST_Class; - /* - private Class CONST_Fieldref; - private Class CONST_Methodref; - private Class CONST_InterfaceMethodref; - */ - private final Class CONST_String; - private final Class CONST_Integer; - private final Class CONST_Float; - private final Class CONST_Long; - private final Class CONST_Double; - private final Class CONST_NameAndType; - private final Class CONST_Utf8; - - private final JavaClass jc; - private final ConstantPool cp; // ==jc.getConstantPool() -- only here to save typing work and computing power. - private final int cplen; // == cp.getLength() -- to save computing power. - private final DescendingVisitor carrier; - - private final Set field_names = new HashSet<>(); - private final Set field_names_and_desc = new HashSet<>(); - private final Set method_names_and_desc = new HashSet<>(); - - private CPESSC_Visitor(final JavaClass _jc) { - jc = _jc; - cp = _jc.getConstantPool(); - cplen = cp.getLength(); - - CONST_Class = ConstantClass.class; - /* - CONST_Fieldref = ConstantFieldref.class; - CONST_Methodref = ConstantMethodref.class; - CONST_InterfaceMethodref = ConstantInterfaceMethodref.class; - */ - CONST_String = ConstantString.class; - CONST_Integer = ConstantInteger.class; - CONST_Float = ConstantFloat.class; - CONST_Long = ConstantLong.class; - CONST_Double = ConstantDouble.class; - CONST_NameAndType = ConstantNameAndType.class; - CONST_Utf8 = ConstantUtf8.class; - - carrier = new DescendingVisitor(_jc, this); - carrier.visit(); - } - - private void checkIndex(final Node referrer, final int index, final Class shouldbe) { - if ((index < 0) || (index >= cplen)) { - throw new ClassConstraintException("Invalid index '"+index+"' used by '"+tostring(referrer)+"'."); - } - final Constant c = cp.getConstant(index); - if (! shouldbe.isInstance(c)) { - /* String isnot = shouldbe.toString().substring(shouldbe.toString().lastIndexOf(".")+1); //Cut all before last "." */ - throw new ClassCastException("Illegal constant '"+tostring(c)+"' at index '"+ - index+"'. '"+tostring(referrer)+"' expects a '"+shouldbe+"'."); - } - } - /////////////////////////////////////// - // ClassFile structure (vmspec2 4.1) // - /////////////////////////////////////// - @Override - public void visitJavaClass(final JavaClass obj) { - final Attribute[] atts = obj.getAttributes(); - boolean foundSourceFile = false; - boolean foundInnerClasses = false; - - // Is there an InnerClass referenced? - // This is a costly check; existing verifiers don't do it! - final boolean hasInnerClass = new InnerClassDetector(jc).innerClassReferenced(); - - for (final Attribute att : atts) { - if ((!(att instanceof SourceFile)) && - (!(att instanceof Deprecated)) && - (!(att instanceof InnerClasses)) && - (!(att instanceof Synthetic))) { - addMessage("Attribute '" + tostring(att) + "' as an attribute of the ClassFile structure '" + - tostring(obj) + "' is unknown and will therefore be ignored."); - } - - if (att instanceof SourceFile) { - if (!foundSourceFile) { - foundSourceFile = true; - } else { - throw new ClassConstraintException("A ClassFile structure (like '" + - tostring(obj) + "') may have no more than one SourceFile attribute."); //vmspec2 4.7.7 - } - } - - if (att instanceof InnerClasses) { - if (!foundInnerClasses) { - foundInnerClasses = true; - } else { - if (hasInnerClass) { - throw new ClassConstraintException("A Classfile structure (like '" + tostring(obj) + - "') must have exactly one InnerClasses attribute"+ - " if at least one Inner Class is referenced (which is the case)."+ - " More than one InnerClasses attribute was found."); - } - } - if (!hasInnerClass) { - addMessage("No referenced Inner Class found, but InnerClasses attribute '" + tostring(att) + - "' found. Strongly suggest removal of that attribute."); - } - } - - } - if (hasInnerClass && !foundInnerClasses) { - //throw new ClassConstraintException("A Classfile structure (like '"+tostring(obj)+ - // "') must have exactly one InnerClasses attribute if at least one Inner Class is referenced (which is the case)."+ - // " No InnerClasses attribute was found."); - //vmspec2, page 125 says it would be a constraint: but existing verifiers - //don't check it and javac doesn't satisfy it when it comes to anonymous - //inner classes - addMessage("A Classfile structure (like '"+tostring(obj)+ - "') must have exactly one InnerClasses attribute if at least one Inner Class is referenced (which is the case)."+ - " No InnerClasses attribute was found."); - } - } - ///////////////////////////// - // CONSTANTS (vmspec2 4.4) // - ///////////////////////////// - @Override - public void visitConstantClass(final ConstantClass obj) { - if (obj.getTag() != Const.CONSTANT_Class) { - throw new ClassConstraintException("Wrong constant tag in '"+tostring(obj)+"'."); - } - checkIndex(obj, obj.getNameIndex(), CONST_Utf8); - - } - @Override - public void visitConstantFieldref(final ConstantFieldref obj) { - if (obj.getTag() != Const.CONSTANT_Fieldref) { - throw new ClassConstraintException("Wrong constant tag in '"+tostring(obj)+"'."); - } - checkIndex(obj, obj.getClassIndex(), CONST_Class); - checkIndex(obj, obj.getNameAndTypeIndex(), CONST_NameAndType); - } - @Override - public void visitConstantMethodref(final ConstantMethodref obj) { - if (obj.getTag() != Const.CONSTANT_Methodref) { - throw new ClassConstraintException("Wrong constant tag in '"+tostring(obj)+"'."); - } - checkIndex(obj, obj.getClassIndex(), CONST_Class); - checkIndex(obj, obj.getNameAndTypeIndex(), CONST_NameAndType); - } - @Override - public void visitConstantInterfaceMethodref(final ConstantInterfaceMethodref obj) { - if (obj.getTag() != Const.CONSTANT_InterfaceMethodref) { - throw new ClassConstraintException("Wrong constant tag in '"+tostring(obj)+"'."); - } - checkIndex(obj, obj.getClassIndex(), CONST_Class); - checkIndex(obj, obj.getNameAndTypeIndex(), CONST_NameAndType); - } - @Override - public void visitConstantString(final ConstantString obj) { - if (obj.getTag() != Const.CONSTANT_String) { - throw new ClassConstraintException("Wrong constant tag in '"+tostring(obj)+"'."); - } - checkIndex(obj, obj.getStringIndex(), CONST_Utf8); - } - @Override - public void visitConstantInteger(final ConstantInteger obj) { - if (obj.getTag() != Const.CONSTANT_Integer) { - throw new ClassConstraintException("Wrong constant tag in '"+tostring(obj)+"'."); - } - // no indices to check - } - @Override - public void visitConstantFloat(final ConstantFloat obj) { - if (obj.getTag() != Const.CONSTANT_Float) { - throw new ClassConstraintException("Wrong constant tag in '"+tostring(obj)+"'."); - } - //no indices to check - } - @Override - public void visitConstantLong(final ConstantLong obj) { - if (obj.getTag() != Const.CONSTANT_Long) { - throw new ClassConstraintException("Wrong constant tag in '"+tostring(obj)+"'."); - } - //no indices to check - } - @Override - public void visitConstantDouble(final ConstantDouble obj) { - if (obj.getTag() != Const.CONSTANT_Double) { - throw new ClassConstraintException("Wrong constant tag in '"+tostring(obj)+"'."); - } - //no indices to check - } - @Override - public void visitConstantNameAndType(final ConstantNameAndType obj) { - if (obj.getTag() != Const.CONSTANT_NameAndType) { - throw new ClassConstraintException("Wrong constant tag in '"+tostring(obj)+"'."); - } - checkIndex(obj, obj.getNameIndex(), CONST_Utf8); - //checkIndex(obj, obj.getDescriptorIndex(), CONST_Utf8); //inconsistently named in BCEL, see below. - checkIndex(obj, obj.getSignatureIndex(), CONST_Utf8); - } - @Override - public void visitConstantUtf8(final ConstantUtf8 obj) { - if (obj.getTag() != Const.CONSTANT_Utf8) { - throw new ClassConstraintException("Wrong constant tag in '"+tostring(obj)+"'."); - } - //no indices to check - } - ////////////////////////// - // FIELDS (vmspec2 4.5) // - ////////////////////////// - @Override - public void visitField(final Field obj) { - - if (jc.isClass()) { - int maxone=0; - if (obj.isPrivate()) { - maxone++; - } - if (obj.isProtected()) { - maxone++; - } - if (obj.isPublic()) { - maxone++; - } - if (maxone > 1) { - throw new ClassConstraintException("Field '"+tostring(obj)+ - "' must only have at most one of its ACC_PRIVATE, ACC_PROTECTED, ACC_PUBLIC modifiers set."); - } - - if (obj.isFinal() && obj.isVolatile()) { - throw new ClassConstraintException("Field '"+tostring(obj)+ - "' must only have at most one of its ACC_FINAL, ACC_VOLATILE modifiers set."); - } - } - else{ // isInterface! - if (!obj.isPublic()) { - throw new ClassConstraintException("Interface field '"+tostring(obj)+ - "' must have the ACC_PUBLIC modifier set but hasn't!"); - } - if (!obj.isStatic()) { - throw new ClassConstraintException("Interface field '"+tostring(obj)+ - "' must have the ACC_STATIC modifier set but hasn't!"); - } - if (!obj.isFinal()) { - throw new ClassConstraintException("Interface field '"+tostring(obj)+ - "' must have the ACC_FINAL modifier set but hasn't!"); - } - } - - if ((obj.getAccessFlags() & ~(Const.ACC_PUBLIC|Const.ACC_PRIVATE|Const.ACC_PROTECTED|Const.ACC_STATIC| - Const.ACC_FINAL|Const.ACC_VOLATILE|Const.ACC_TRANSIENT)) > 0) { - addMessage("Field '"+tostring(obj)+ - "' has access flag(s) other than ACC_PUBLIC, ACC_PRIVATE, ACC_PROTECTED,"+ - " ACC_STATIC, ACC_FINAL, ACC_VOLATILE, ACC_TRANSIENT set (ignored)."); - } - - checkIndex(obj, obj.getNameIndex(), CONST_Utf8); - - final String name = obj.getName(); - if (! validFieldName(name)) { - throw new ClassConstraintException("Field '"+tostring(obj)+"' has illegal name '"+obj.getName()+"'."); - } - - // A descriptor is often named signature in BCEL - checkIndex(obj, obj.getSignatureIndex(), CONST_Utf8); - - final String sig = ((ConstantUtf8) (cp.getConstant(obj.getSignatureIndex()))).getBytes(); // Field or Method sig.(=descriptor) - - try{ - Type.getType(sig); /* Don't need the return value */ - } - catch (final ClassFormatException cfe) { - throw new ClassConstraintException("Illegal descriptor (==signature) '"+sig+"' used by '"+tostring(obj)+"'.", cfe); - } - - final String nameanddesc = name+sig; - if (field_names_and_desc.contains(nameanddesc)) { - throw new ClassConstraintException("No two fields (like '"+tostring(obj)+ - "') are allowed have same names and descriptors!"); - } - if (field_names.contains(name)) { - addMessage("More than one field of name '"+name+ - "' detected (but with different type descriptors). This is very unusual."); - } - field_names_and_desc.add(nameanddesc); - field_names.add(name); - - final Attribute[] atts = obj.getAttributes(); - for (final Attribute att : atts) { - if ((!(att instanceof ConstantValue)) && - (!(att instanceof Synthetic)) && - (!(att instanceof Deprecated))) { - addMessage("Attribute '" + tostring(att) + "' as an attribute of Field '" + - tostring(obj) + "' is unknown and will therefore be ignored."); - } - if (!(att instanceof ConstantValue)) { - addMessage("Attribute '" + tostring(att) + "' as an attribute of Field '" + tostring(obj) + - "' is not a ConstantValue and is therefore only of use for debuggers and such."); - } - } - } - /////////////////////////// - // METHODS (vmspec2 4.6) // - /////////////////////////// - @Override - public void visitMethod(final Method obj) { - - checkIndex(obj, obj.getNameIndex(), CONST_Utf8); - - final String name = obj.getName(); - if (! validMethodName(name, true)) { - throw new ClassConstraintException("Method '"+tostring(obj)+"' has illegal name '"+name+"'."); - } - - // A descriptor is often named signature in BCEL - checkIndex(obj, obj.getSignatureIndex(), CONST_Utf8); - - final String sig = ((ConstantUtf8) (cp.getConstant(obj.getSignatureIndex()))).getBytes(); // Method's signature(=descriptor) - - Type t; - Type[] ts; // needed below the try block. - try{ - t = Type.getReturnType(sig); - ts = Type.getArgumentTypes(sig); - } - catch (final ClassFormatException cfe) { - throw new ClassConstraintException( - "Illegal descriptor (==signature) '"+sig+"' used by Method '"+tostring(obj)+"'.", cfe); - } - - // Check if referenced objects exist. - Type act = t; - if (act instanceof ArrayType) { - act = ((ArrayType) act).getBasicType(); - } - if (act instanceof ObjectType) { - final Verifier v = VerifierFactory.getVerifier( ((ObjectType) act).getClassName() ); - final VerificationResult vr = v.doPass1(); - if (vr != VerificationResult.VR_OK) { - throw new ClassConstraintException( - "Method '"+tostring(obj)+"' has a return type that does not pass verification pass 1: '"+vr+"'."); - } - } - - for (final Type element : ts) { - act = element; - if (act instanceof ArrayType) { - act = ((ArrayType) act).getBasicType(); - } - if (act instanceof ObjectType) { - final Verifier v = VerifierFactory.getVerifier( ((ObjectType) act).getClassName() ); - final VerificationResult vr = v.doPass1(); - if (vr != VerificationResult.VR_OK) { - throw new ClassConstraintException( - "Method '"+tostring(obj)+"' has an argument type that does not pass verification pass 1: '"+vr+"'."); - } - } - } - - // Nearly forgot this! Funny return values are allowed, but a non-empty arguments list makes a different method out of it! - if (name.equals(Const.STATIC_INITIALIZER_NAME) && (ts.length != 0)) { - throw new ClassConstraintException( - "Method '"+tostring(obj)+"' has illegal name '"+name+"'."+ - " Its name resembles the class or interface initialization method"+ - " which it isn't because of its arguments (==descriptor)."); - } - - if (jc.isClass()) { - int maxone=0; - if (obj.isPrivate()) { - maxone++; - } - if (obj.isProtected()) { - maxone++; - } - if (obj.isPublic()) { - maxone++; - } - if (maxone > 1) { - throw new ClassConstraintException("Method '"+tostring(obj)+ - "' must only have at most one of its ACC_PRIVATE, ACC_PROTECTED, ACC_PUBLIC modifiers set."); - } - - if (obj.isAbstract()) { - if (obj.isFinal()) { - throw new ClassConstraintException( - "Abstract method '"+tostring(obj)+"' must not have the ACC_FINAL modifier set."); - } - if (obj.isNative()) { - throw new ClassConstraintException( - "Abstract method '"+tostring(obj)+"' must not have the ACC_NATIVE modifier set."); - } - if (obj.isPrivate()) { - throw new ClassConstraintException( - "Abstract method '"+tostring(obj)+"' must not have the ACC_PRIVATE modifier set."); - } - if (obj.isStatic()) { - throw new ClassConstraintException( - "Abstract method '"+tostring(obj)+"' must not have the ACC_STATIC modifier set."); - } - if (obj.isStrictfp()) { - throw new ClassConstraintException( - "Abstract method '"+tostring(obj)+"' must not have the ACC_STRICT modifier set."); - } - if (obj.isSynchronized()) { - throw new ClassConstraintException( - "Abstract method '"+tostring(obj)+"' must not have the ACC_SYNCHRONIZED modifier set."); - } - } - - // A specific instance initialization method... (vmspec2,Page 116). - if (name.equals(Const.CONSTRUCTOR_NAME)) { - //..may have at most one of ACC_PRIVATE, ACC_PROTECTED, ACC_PUBLIC set: is checked above. - //..may also have ACC_STRICT set, but none of the other flags in table 4.5 (vmspec2, page 115) - if (obj.isStatic() || - obj.isFinal() || - obj.isSynchronized() || - obj.isNative() || - obj.isAbstract()) { - throw new ClassConstraintException("Instance initialization method '" + tostring(obj) + "' must not have" + - " any of the ACC_STATIC, ACC_FINAL, ACC_SYNCHRONIZED, ACC_NATIVE, ACC_ABSTRACT modifiers set."); - } - } - } - else{ // isInterface! - if (!name.equals(Const.STATIC_INITIALIZER_NAME)) {//vmspec2, p.116, 2nd paragraph - if (jc.getMajor() >= Const.MAJOR_1_8) { - if (!(obj.isPublic() ^ obj.isPrivate())) { - throw new ClassConstraintException("Interface method '" + tostring(obj) + "' must have" + - " exactly one of its ACC_PUBLIC and ACC_PRIVATE modifiers set."); - } - if (obj.isProtected() - || obj.isFinal() - || obj.isSynchronized() - || obj.isNative()) { - throw new ClassConstraintException("Interface method '"+tostring(obj)+ "' must not have" + - " any of the ACC_PROTECTED, ACC_FINAL, ACC_SYNCHRONIZED, or ACC_NATIVE modifiers set."); - } - - } else { - if (!obj.isPublic()) { - throw new ClassConstraintException( - "Interface method '"+tostring(obj)+"' must have the ACC_PUBLIC modifier set but hasn't!"); - } - if (!obj.isAbstract()) { - throw new ClassConstraintException( - "Interface method '"+tostring(obj)+"' must have the ACC_ABSTRACT modifier set but hasn't!"); - } - if (obj.isPrivate() - || obj.isProtected() - || obj.isStatic() - || obj.isFinal() - || obj.isSynchronized() - || obj.isNative() - || obj.isStrictfp() ) { - throw new ClassConstraintException("Interface method '"+tostring(obj)+ "' must not have" + - " any of the ACC_PRIVATE, ACC_PROTECTED, ACC_STATIC, ACC_FINAL, ACC_SYNCHRONIZED,"+ - " ACC_NATIVE, ACC_ABSTRACT, ACC_STRICT modifiers set."); - } - } - } - } - - if ((obj.getAccessFlags() & - ~(Const.ACC_PUBLIC|Const.ACC_PRIVATE|Const.ACC_PROTECTED|Const.ACC_STATIC|Const.ACC_FINAL| - Const.ACC_SYNCHRONIZED|Const.ACC_NATIVE|Const.ACC_ABSTRACT|Const.ACC_STRICT)) > 0) { - addMessage("Method '"+tostring(obj)+"' has access flag(s) other than"+ - " ACC_PUBLIC, ACC_PRIVATE, ACC_PROTECTED, ACC_STATIC, ACC_FINAL,"+ - " ACC_SYNCHRONIZED, ACC_NATIVE, ACC_ABSTRACT, ACC_STRICT set (ignored)."); - } - - final String nameanddesc = name+sig; - if (method_names_and_desc.contains(nameanddesc)) { - throw new ClassConstraintException( - "No two methods (like '"+tostring(obj)+"') are allowed have same names and desciptors!"); - } - method_names_and_desc.add(nameanddesc); - - final Attribute[] atts = obj.getAttributes(); - int num_code_atts = 0; - for (final Attribute att : atts) { - if ((!(att instanceof Code)) && - (!(att instanceof ExceptionTable)) && - (!(att instanceof Synthetic)) && - (!(att instanceof Deprecated))) { - addMessage("Attribute '" + tostring(att) + "' as an attribute of Method '" + tostring(obj) + - "' is unknown and will therefore be ignored."); - } - if ((!(att instanceof Code)) && - (!(att instanceof ExceptionTable))) { - addMessage("Attribute '" + tostring(att) + "' as an attribute of Method '" + tostring(obj) + - "' is neither Code nor Exceptions and is therefore only of use for debuggers and such."); - } - if ((att instanceof Code) && (obj.isNative() || obj.isAbstract())) { - throw new ClassConstraintException("Native or abstract methods like '" + tostring(obj) + - "' must not have a Code attribute like '" + tostring(att) + "'."); //vmspec2 page120, 4.7.3 - } - if (att instanceof Code) { - num_code_atts++; - } - } - if ( !obj.isNative() && !obj.isAbstract() && num_code_atts != 1) { - throw new ClassConstraintException("Non-native, non-abstract methods like '"+tostring(obj)+ - "' must have exactly one Code attribute (found: "+num_code_atts+")."); - } - } - /////////////////////////////////////////////////////// - // ClassFile-structure-ATTRIBUTES (vmspec2 4.1, 4.7) // - /////////////////////////////////////////////////////// - @Override - public void visitSourceFile(final SourceFile obj) {//vmspec2 4.7.7 - - // zero or one SourceFile attr per ClassFile: see visitJavaClass() - - checkIndex(obj, obj.getNameIndex(), CONST_Utf8); - - final String name = ((ConstantUtf8) cp.getConstant(obj.getNameIndex())).getBytes(); - if (! name.equals("SourceFile")) { - throw new ClassConstraintException( - "The SourceFile attribute '"+tostring(obj)+"' is not correctly named 'SourceFile' but '"+name+"'."); - } - - checkIndex(obj, obj.getSourceFileIndex(), CONST_Utf8); - - final String sourceFileName = ((ConstantUtf8) cp.getConstant(obj.getSourceFileIndex())).getBytes(); //==obj.getSourceFileName() ? - final String sourceFileNameLc = sourceFileName.toLowerCase(Locale.ENGLISH); - - if ( (sourceFileName.indexOf('/') != -1) || - (sourceFileName.indexOf('\\') != -1) || - (sourceFileName.indexOf(':') != -1) || - (sourceFileNameLc.lastIndexOf(".java") == -1) ) { - addMessage("SourceFile attribute '"+tostring(obj)+ - "' has a funny name: remember not to confuse certain parsers working on javap's output. Also, this name ('"+ - sourceFileName+"') is considered an unqualified (simple) file name only."); - } - } - @Override - public void visitDeprecated(final Deprecated obj) {//vmspec2 4.7.10 - checkIndex(obj, obj.getNameIndex(), CONST_Utf8); - - final String name = ((ConstantUtf8) cp.getConstant(obj.getNameIndex())).getBytes(); - if (! name.equals("Deprecated")) { - throw new ClassConstraintException("The Deprecated attribute '"+tostring(obj)+ - "' is not correctly named 'Deprecated' but '"+name+"'."); - } - } - @Override - public void visitSynthetic(final Synthetic obj) {//vmspec2 4.7.6 - checkIndex(obj, obj.getNameIndex(), CONST_Utf8); - final String name = ((ConstantUtf8) cp.getConstant(obj.getNameIndex())).getBytes(); - if (! name.equals("Synthetic")) { - throw new ClassConstraintException( - "The Synthetic attribute '"+tostring(obj)+"' is not correctly named 'Synthetic' but '"+name+"'."); - } - } - @Override - public void visitInnerClasses(final InnerClasses obj) {//vmspec2 4.7.5 - - // exactly one InnerClasses attr per ClassFile if some inner class is refernced: see visitJavaClass() - - checkIndex(obj, obj.getNameIndex(), CONST_Utf8); - - final String name = ((ConstantUtf8) cp.getConstant(obj.getNameIndex())).getBytes(); - if (! name.equals("InnerClasses")) { - throw new ClassConstraintException( - "The InnerClasses attribute '"+tostring(obj)+"' is not correctly named 'InnerClasses' but '"+name+"'."); - } - - final InnerClass[] ics = obj.getInnerClasses(); - - for (final InnerClass ic : ics) { - checkIndex(obj, ic.getInnerClassIndex(), CONST_Class); - final int outer_idx = ic.getOuterClassIndex(); - if (outer_idx != 0) { - checkIndex(obj, outer_idx, CONST_Class); - } - final int innername_idx = ic.getInnerNameIndex(); - if (innername_idx != 0) { - checkIndex(obj, innername_idx, CONST_Utf8); - } - int acc = ic.getInnerAccessFlags(); - acc = acc & (~ (Const.ACC_PUBLIC | Const.ACC_PRIVATE | Const.ACC_PROTECTED | - Const.ACC_STATIC | Const.ACC_FINAL | Const.ACC_INTERFACE | Const.ACC_ABSTRACT)); - if (acc != 0) { - addMessage( - "Unknown access flag for inner class '"+tostring(ic)+"' set (InnerClasses attribute '"+tostring(obj)+"')."); - } - } - // Semantical consistency is not yet checked by Sun, see vmspec2 4.7.5. - // [marked TODO in JustIce] - } - //////////////////////////////////////////////////////// - // field_info-structure-ATTRIBUTES (vmspec2 4.5, 4.7) // - //////////////////////////////////////////////////////// - @Override - public void visitConstantValue(final ConstantValue obj) {//vmspec2 4.7.2 - // Despite its name, this really is an Attribute, - // not a constant! - checkIndex(obj, obj.getNameIndex(), CONST_Utf8); - - final String name = ((ConstantUtf8) cp.getConstant(obj.getNameIndex())).getBytes(); - if (! name.equals("ConstantValue")) { - throw new ClassConstraintException( - "The ConstantValue attribute '"+tostring(obj)+"' is not correctly named 'ConstantValue' but '"+name+"'."); - } - - final Object pred = carrier.predecessor(); - if (pred instanceof Field) { //ConstantValue attributes are quite senseless if the predecessor is not a field. - final Field f = (Field) pred; - // Field constraints have been checked before -- so we are safe using their type information. - final Type field_type = Type.getType(((ConstantUtf8) (cp.getConstant(f.getSignatureIndex()))).getBytes()); - - final int index = obj.getConstantValueIndex(); - if ((index < 0) || (index >= cplen)) { - throw new ClassConstraintException("Invalid index '"+index+"' used by '"+tostring(obj)+"'."); - } - final Constant c = cp.getConstant(index); - - if (CONST_Long.isInstance(c) && field_type.equals(Type.LONG)) { - return; - } - if (CONST_Float.isInstance(c) && field_type.equals(Type.FLOAT)) { - return; - } - if (CONST_Double.isInstance(c) && field_type.equals(Type.DOUBLE)) { - return; - } - if (CONST_Integer.isInstance(c) && (field_type.equals(Type.INT) || field_type.equals(Type.SHORT) || - field_type.equals(Type.CHAR) || field_type.equals(Type.BYTE) || field_type.equals(Type.BOOLEAN))) { - return; - } - if (CONST_String.isInstance(c) && field_type.equals(Type.STRING)) { - return; - } - - throw new ClassConstraintException("Illegal type of ConstantValue '"+obj+"' embedding Constant '"+c+ - "'. It is referenced by field '"+tostring(f)+"' expecting a different type: '"+field_type+"'."); - } - } - // SYNTHETIC: see above - // DEPRECATED: see above - ///////////////////////////////////////////////////////// - // method_info-structure-ATTRIBUTES (vmspec2 4.6, 4.7) // - ///////////////////////////////////////////////////////// - @Override - public void visitCode(final Code obj) {//vmspec2 4.7.3 - try { - // No code attribute allowed for native or abstract methods: see visitMethod(Method). - // Code array constraints are checked in Pass3 (3a and 3b). - - checkIndex(obj, obj.getNameIndex(), CONST_Utf8); - - final String name = ((ConstantUtf8) cp.getConstant(obj.getNameIndex())).getBytes(); - if (! name.equals("Code")) { - throw new ClassConstraintException( - "The Code attribute '"+tostring(obj)+"' is not correctly named 'Code' but '"+name+"'."); - } - - Method m = null; // satisfy compiler - if (!(carrier.predecessor() instanceof Method)) { - addMessage("Code attribute '"+tostring(obj)+"' is not declared in a method_info structure but in '"+ - carrier.predecessor()+"'. Ignored."); - return; - } - m = (Method) carrier.predecessor(); // we can assume this method was visited before; - // i.e. the data consistency was verified. - - if (obj.getCode().length == 0) { - throw new ClassConstraintException( - "Code array of Code attribute '"+tostring(obj)+"' (method '"+m+"') must not be empty."); - } - - //In JustIce, the check for correct offsets into the code array is delayed to Pass 3a. - final CodeException[] exc_table = obj.getExceptionTable(); - for (final CodeException element : exc_table) { - final int exc_index = element.getCatchType(); - if (exc_index != 0) { // if 0, it catches all Throwables - checkIndex(obj, exc_index, CONST_Class); - final ConstantClass cc = (ConstantClass) (cp.getConstant(exc_index)); - // cannot be sure this ConstantClass has already been visited (checked)! - checkIndex(cc, cc.getNameIndex(), CONST_Utf8); - final String cname = ((ConstantUtf8) cp.getConstant(cc.getNameIndex())).getBytes().replace('/','.'); - - Verifier v = VerifierFactory.getVerifier(cname); - VerificationResult vr = v.doPass1(); - - if (vr != VerificationResult.VR_OK) { - throw new ClassConstraintException("Code attribute '"+tostring(obj)+"' (method '"+m+ - "') has an exception_table entry '"+tostring(element)+"' that references '"+cname+ - "' as an Exception but it does not pass verification pass 1: "+vr); - } - // We cannot safely trust any other "instanceof" mechanism. We need to transitively verify - // the ancestor hierarchy. - JavaClass e = Repository.lookupClass(cname); - final JavaClass t = Repository.lookupClass(Type.THROWABLE.getClassName()); - final JavaClass o = Repository.lookupClass(Type.OBJECT.getClassName()); - while (e != o) { - if (e == t) { - break; // It's a subclass of Throwable, OKAY, leave. - } - - v = VerifierFactory.getVerifier(e.getSuperclassName()); - vr = v.doPass1(); - if (vr != VerificationResult.VR_OK) { - throw new ClassConstraintException("Code attribute '"+tostring(obj)+"' (method '"+m+ - "') has an exception_table entry '"+tostring(element)+"' that references '"+cname+ - "' as an Exception but '"+e.getSuperclassName()+ - "' in the ancestor hierachy does not pass verification pass 1: "+vr); - } - e = Repository.lookupClass(e.getSuperclassName()); - } - if (e != t) { - throw new ClassConstraintException("Code attribute '"+tostring(obj)+"' (method '"+m+ - "') has an exception_table entry '"+tostring(element)+"' that references '"+cname+ - "' as an Exception but it is not a subclass of '"+t.getClassName()+"'."); - } - } - } - - // Create object for local variables information - // This is highly unelegant due to usage of the Visitor pattern. - // TODO: rework it. - int method_number = -1; - final Method[] ms = Repository.lookupClass(myOwner.getClassName()).getMethods(); - for (int mn=0; mn= code.getMaxLocals()) { - throw new ClassConstraintException("LocalVariableTable attribute '"+tostring(lvt)+ - "' references a LocalVariable '"+tostring(localvariable)+ - "' with an index that exceeds the surrounding Code attribute's max_locals value of '"+ - code.getMaxLocals()+"'."); - } - - try{ - localVariablesInfos[method_number].add(localindex, localname, localvariable.getStartPC(), - localvariable.getLength(), t); - } - catch(final LocalVariableInfoInconsistentException lviie) { - throw new ClassConstraintException("Conflicting information in LocalVariableTable '"+tostring(lvt)+ - "' found in Code attribute '"+tostring(obj)+ - "' (method '"+tostring(m)+"'). "+lviie.getMessage(), lviie); - } - }// for all local variables localvariables[i] in the LocalVariableTable attribute atts[a] END - - num_of_lvt_attribs++; - if (!m.isStatic() && num_of_lvt_attribs > obj.getMaxLocals()) { - throw new ClassConstraintException("Number of LocalVariableTable attributes of Code attribute '"+ - tostring(obj)+"' (method '"+tostring(m)+"') exceeds number of local variable slots '"+obj.getMaxLocals()+ - "' ('There may be at most one LocalVariableTable attribute per local variable in the Code attribute.')."); - } - }// if atts[a] instanceof LocalVariableTable END - }// for all attributes atts[a] END - - } catch (final ClassNotFoundException e) { - // FIXME: this might not be the best way to handle missing classes. - throw new AssertionViolatedException("Missing class: " + e, e); - } - - }// visitCode(Code) END - - @Override - public void visitExceptionTable(final ExceptionTable obj) {//vmspec2 4.7.4 - try { - // incorrectly named, it's the Exceptions attribute (vmspec2 4.7.4) - checkIndex(obj, obj.getNameIndex(), CONST_Utf8); - - final String name = ((ConstantUtf8) cp.getConstant(obj.getNameIndex())).getBytes(); - if (! name.equals("Exceptions")) { - throw new ClassConstraintException( - "The Exceptions attribute '"+tostring(obj)+"' is not correctly named 'Exceptions' but '"+name+"'."); - } - - final int[] exc_indices = obj.getExceptionIndexTable(); - - for (final int exc_indice : exc_indices) { - checkIndex(obj, exc_indice, CONST_Class); - - final ConstantClass cc = (ConstantClass) (cp.getConstant(exc_indice)); - checkIndex(cc, cc.getNameIndex(), CONST_Utf8); // can't be sure this ConstantClass has already been visited (checked)! - //convert internal notation on-the-fly to external notation: - final String cname = ((ConstantUtf8) cp.getConstant(cc.getNameIndex())).getBytes().replace('/','.'); - - Verifier v = VerifierFactory.getVerifier(cname); - VerificationResult vr = v.doPass1(); - - if (vr != VerificationResult.VR_OK) { - throw new ClassConstraintException("Exceptions attribute '"+tostring(obj)+"' references '"+cname+ - "' as an Exception but it does not pass verification pass 1: "+vr); - } - // We cannot safely trust any other "instanceof" mechanism. We need to transitively verify - // the ancestor hierarchy. - JavaClass e = Repository.lookupClass(cname); - final JavaClass t = Repository.lookupClass(Type.THROWABLE.getClassName()); - final JavaClass o = Repository.lookupClass(Type.OBJECT.getClassName()); - while (e != o) { - if (e == t) { - break; // It's a subclass of Throwable, OKAY, leave. - } - - v = VerifierFactory.getVerifier(e.getSuperclassName()); - vr = v.doPass1(); - if (vr != VerificationResult.VR_OK) { - throw new ClassConstraintException("Exceptions attribute '"+tostring(obj)+"' references '"+cname+ - "' as an Exception but '"+e.getSuperclassName()+ - "' in the ancestor hierachy does not pass verification pass 1: "+vr); - } - e = Repository.lookupClass(e.getSuperclassName()); - } - if (e != t) { - throw new ClassConstraintException("Exceptions attribute '"+tostring(obj)+"' references '"+cname+ - "' as an Exception but it is not a subclass of '"+t.getClassName()+"'."); - } - } - - } catch (final ClassNotFoundException e) { - // FIXME: this might not be the best way to handle missing classes. - throw new AssertionViolatedException("Missing class: " + e, e); - } - } - // SYNTHETIC: see above - // DEPRECATED: see above - ////////////////////////////////////////////////////////////// - // code_attribute-structure-ATTRIBUTES (vmspec2 4.7.3, 4.7) // - ////////////////////////////////////////////////////////////// - @Override - public void visitLineNumberTable(final LineNumberTable obj) {//vmspec2 4.7.8 - checkIndex(obj, obj.getNameIndex(), CONST_Utf8); - - final String name = ((ConstantUtf8) cp.getConstant(obj.getNameIndex())).getBytes(); - if (! name.equals("LineNumberTable")) { - throw new ClassConstraintException("The LineNumberTable attribute '"+tostring(obj)+ - "' is not correctly named 'LineNumberTable' but '"+name+"'."); - } - - //In JustIce,this check is delayed to Pass 3a. - //LineNumber[] linenumbers = obj.getLineNumberTable(); - // ...validity check... - - } - @Override - public void visitLocalVariableTable(final LocalVariableTable obj) {//vmspec2 4.7.9 - //In JustIce,this check is partially delayed to Pass 3a. - //The other part can be found in the visitCode(Code) method. - } - //////////////////////////////////////////////////// - // MISC-structure-ATTRIBUTES (vmspec2 4.7.1, 4.7) // - //////////////////////////////////////////////////// - @Override - public void visitUnknown(final Unknown obj) {//vmspec2 4.7.1 - // Represents an unknown attribute. - checkIndex(obj, obj.getNameIndex(), CONST_Utf8); - - // Maybe only misnamed? Give a (warning) message. - addMessage("Unknown attribute '"+tostring(obj)+"'. This attribute is not known in any context!"); - } - ////////// - // BCEL // - ////////// - @Override - public void visitLocalVariable(final LocalVariable obj) { - // This does not represent an Attribute but is only - // related to internal BCEL data representation. - - // see visitLocalVariableTable(LocalVariableTable) - } - @Override - public void visitCodeException(final CodeException obj) { - // Code constraints are checked in Pass3 (3a and 3b). - // This does not represent an Attribute but is only - // related to internal BCEL data representation. - - // see visitCode(Code) - } - @Override - public void visitConstantPool(final ConstantPool obj) { - // No need to. We're piggybacked by the DescendingVisitor. - // This does not represent an Attribute but is only - // related to internal BCEL data representation. - } - @Override - public void visitInnerClass(final InnerClass obj) { - // This does not represent an Attribute but is only - // related to internal BCEL data representation. - } - @Override - public void visitLineNumber(final LineNumber obj) { - // This does not represent an Attribute but is only - // related to internal BCEL data representation. - - // see visitLineNumberTable(LineNumberTable) - } - } - - /** - * Ensures that the ConstantCP-subclassed entries of the constant - * pool are valid. According to "Yellin: Low Level Security in Java", - * this method does not verify the existence of referenced entities - * (such as classes) but only the formal correctness (such as well-formed - * signatures). - * The visitXXX() methods throw ClassConstraintException instances otherwise. - * Precondition: index-style cross referencing in the constant - * pool must be valid. Simply invoke constant_pool_entries_satisfy_static_constraints() - * before. - * - * @throws ClassConstraintException otherwise. - * @see #constant_pool_entries_satisfy_static_constraints() - */ - private void field_and_method_refs_are_valid() { - try { - final JavaClass jc = Repository.lookupClass(myOwner.getClassName()); - final DescendingVisitor v = new DescendingVisitor(jc, new FAMRAV_Visitor(jc)); - v.visit(); - - } catch (final ClassNotFoundException e) { - // FIXME: this might not be the best way to handle missing classes. - throw new AssertionViolatedException("Missing class: " + e, e); - } - } - - /** - * A Visitor class that ensures the ConstantCP-subclassed entries - * of the constant pool are valid. - * Precondition: index-style cross referencing in the constant - * pool must be valid. - * - * @see #constant_pool_entries_satisfy_static_constraints() - * @see org.apache.bcel.classfile.ConstantCP - */ - private final class FAMRAV_Visitor extends EmptyVisitor{ - private final ConstantPool cp; // ==jc.getConstantPool() -- only here to save typing work. - private FAMRAV_Visitor(final JavaClass _jc) { - cp = _jc.getConstantPool(); - } - - @Override - public void visitConstantFieldref(final ConstantFieldref obj) { - if (obj.getTag() != Const.CONSTANT_Fieldref) { - throw new ClassConstraintException("ConstantFieldref '"+tostring(obj)+"' has wrong tag!"); - } - final int name_and_type_index = obj.getNameAndTypeIndex(); - final ConstantNameAndType cnat = (ConstantNameAndType) (cp.getConstant(name_and_type_index)); - final String name = ((ConstantUtf8) (cp.getConstant(cnat.getNameIndex()))).getBytes(); // Field or Method name - if (!validFieldName(name)) { - throw new ClassConstraintException("Invalid field name '"+name+"' referenced by '"+tostring(obj)+"'."); - } - - final int class_index = obj.getClassIndex(); - final ConstantClass cc = (ConstantClass) (cp.getConstant(class_index)); - final String className = ((ConstantUtf8) (cp.getConstant(cc.getNameIndex()))).getBytes(); // Class Name in internal form - if (! validClassName(className)) { - throw new ClassConstraintException("Illegal class name '"+className+"' used by '"+tostring(obj)+"'."); - } - - final String sig = ((ConstantUtf8) (cp.getConstant(cnat.getSignatureIndex()))).getBytes(); // Field or Method sig.(=descriptor) - - try{ - Type.getType(sig); /* Don't need the return value */ - } - catch (final ClassFormatException cfe) { - throw new ClassConstraintException("Illegal descriptor (==signature) '"+sig+"' used by '"+tostring(obj)+"'.", cfe); - } - } - - @Override - public void visitConstantMethodref(final ConstantMethodref obj) { - if (obj.getTag() != Const.CONSTANT_Methodref) { - throw new ClassConstraintException("ConstantMethodref '"+tostring(obj)+"' has wrong tag!"); - } - final int name_and_type_index = obj.getNameAndTypeIndex(); - final ConstantNameAndType cnat = (ConstantNameAndType) (cp.getConstant(name_and_type_index)); - final String name = ((ConstantUtf8) (cp.getConstant(cnat.getNameIndex()))).getBytes(); // Field or Method name - if (!validClassMethodName(name)) { - throw new ClassConstraintException( - "Invalid (non-interface) method name '"+name+"' referenced by '"+tostring(obj)+"'."); - } - - final int class_index = obj.getClassIndex(); - final ConstantClass cc = (ConstantClass) (cp.getConstant(class_index)); - final String className = ((ConstantUtf8) (cp.getConstant(cc.getNameIndex()))).getBytes(); // Class Name in internal form - if (! validClassName(className)) { - throw new ClassConstraintException("Illegal class name '"+className+"' used by '"+tostring(obj)+"'."); - } - - final String sig = ((ConstantUtf8) (cp.getConstant(cnat.getSignatureIndex()))).getBytes(); // Field or Method sig.(=descriptor) - - try{ - final Type t = Type.getReturnType(sig); - if ( name.equals(Const.CONSTRUCTOR_NAME) && (t != Type.VOID) ) { - throw new ClassConstraintException("Instance initialization method must have VOID return type."); - } - } - catch (final ClassFormatException cfe) { - throw new ClassConstraintException("Illegal descriptor (==signature) '"+sig+"' used by '"+tostring(obj)+"'.", cfe); - } - } - - @Override - public void visitConstantInterfaceMethodref(final ConstantInterfaceMethodref obj) { - if (obj.getTag() != Const.CONSTANT_InterfaceMethodref) { - throw new ClassConstraintException("ConstantInterfaceMethodref '"+tostring(obj)+"' has wrong tag!"); - } - final int name_and_type_index = obj.getNameAndTypeIndex(); - final ConstantNameAndType cnat = (ConstantNameAndType) (cp.getConstant(name_and_type_index)); - final String name = ((ConstantUtf8) (cp.getConstant(cnat.getNameIndex()))).getBytes(); // Field or Method name - if (!validInterfaceMethodName(name)) { - throw new ClassConstraintException("Invalid (interface) method name '"+name+"' referenced by '"+tostring(obj)+"'."); - } - - final int class_index = obj.getClassIndex(); - final ConstantClass cc = (ConstantClass) (cp.getConstant(class_index)); - final String className = ((ConstantUtf8) (cp.getConstant(cc.getNameIndex()))).getBytes(); // Class Name in internal form - if (! validClassName(className)) { - throw new ClassConstraintException("Illegal class name '"+className+"' used by '"+tostring(obj)+"'."); - } - - final String sig = ((ConstantUtf8) (cp.getConstant(cnat.getSignatureIndex()))).getBytes(); // Field or Method sig.(=descriptor) - - try{ - final Type t = Type.getReturnType(sig); - if ( name.equals(Const.STATIC_INITIALIZER_NAME) && (t != Type.VOID) ) { - addMessage("Class or interface initialization method '"+Const.STATIC_INITIALIZER_NAME+ - "' usually has VOID return type instead of '"+t+ - "'. Note this is really not a requirement of The Java Virtual Machine Specification, Second Edition."); - } - } - catch (final ClassFormatException cfe) { - throw new ClassConstraintException("Illegal descriptor (==signature) '"+sig+"' used by '"+tostring(obj)+"'.", cfe); - } - - } - - } - - /** - * This method returns true if and only if the supplied String - * represents a valid Java class name. - */ - private static boolean validClassName(final String name) { - /* - * TODO: implement. - * Are there any restrictions? - */ - return true; - } - /** - * This method returns true if and only if the supplied String - * represents a valid method name. - * This is basically the same as a valid identifier name in the - * Java programming language, but the special name for - * the instance initialization method is allowed and the special name - * for the class/interface initialization method may be allowed. - */ - private static boolean validMethodName(final String name, final boolean allowStaticInit) { - if (validJavaLangMethodName(name)) { - return true; - } - - if (allowStaticInit) { - return name.equals(Const.CONSTRUCTOR_NAME) || name.equals(Const.STATIC_INITIALIZER_NAME); - } - return name.equals(Const.CONSTRUCTOR_NAME); - } - - /** - * This method returns true if and only if the supplied String - * represents a valid method name that may be referenced by - * ConstantMethodref objects. - */ - private static boolean validClassMethodName(final String name) { - return validMethodName(name, false); - } - - /** - * This method returns true if and only if the supplied String - * represents a valid Java programming language method name stored as a simple - * (non-qualified) name. - * Conforming to: The Java Virtual Machine Specification, Second Edition, �2.7, �2.7.1, �2.2. - */ - private static boolean validJavaLangMethodName(final String name) { - if (!Character.isJavaIdentifierStart(name.charAt(0))) { - return false; - } - - for (int i=1; i, thanks! - } - - // vmspec2 2.7, vmspec2 2.2 - if (!Character.isJavaIdentifierStart(name.charAt(0))) { - return false; - } - - for (int i=1; i= methods.length) { - throw new InvalidMethodException("METHOD DOES NOT EXIST!"); - } - final Method method = methods[methodNo]; - code = method.getCode(); - - // No Code? Nothing to verify! - if ( method.isAbstract() || method.isNative() ) { // IF mg HAS NO CODE (static constraint of Pass 2) - return VerificationResult.VR_OK; - } - - // TODO: - // We want a very sophisticated code examination here with good explanations - // on where to look for an illegal instruction or such. - // Only after that we should try to build an InstructionList and throw an - // AssertionViolatedException if after our examination InstructionList building - // still fails. - // That examination should be implemented in a byte-oriented way, i.e. look for - // an instruction, make sure its validity, count its length, find the next - // instruction and so on. - try{ - instructionList = new InstructionList(method.getCode().getCode()); - } - catch(final RuntimeException re) { - return new VerificationResult(VerificationResult.VERIFIED_REJECTED, - "Bad bytecode in the code array of the Code attribute of method '"+method+"'."); - } - - instructionList.setPositions(true); - - // Start verification. - VerificationResult vr = VerificationResult.VR_OK; //default - try{ - delayedPass2Checks(); - } - catch(final ClassConstraintException cce) { - vr = new VerificationResult(VerificationResult.VERIFIED_REJECTED, cce.getMessage()); - return vr; - } - try{ - pass3StaticInstructionChecks(); - pass3StaticInstructionOperandsChecks(); - } - catch(final StaticCodeConstraintException scce) { - vr = new VerificationResult(VerificationResult.VERIFIED_REJECTED, scce.getMessage()); - } - catch(final ClassCastException cce) { - vr = new VerificationResult(VerificationResult.VERIFIED_REJECTED, "Class Cast Exception: " + cce.getMessage()); - } - return vr; - } - //did not pass Pass 2. - return VerificationResult.VR_NOTYET; - } catch (final ClassNotFoundException e) { - // FIXME: maybe not the best way to handle this - throw new AssertionViolatedException("Missing class: " + e, e); - } - } - - /** - * These are the checks that could be done in pass 2 but are delayed to pass 3 - * for performance reasons. Also, these checks need access to the code array - * of the Code attribute of a Method so it's okay to perform them here. - * Also see the description of the do_verify() method. - * - * @throws ClassConstraintException if the verification fails. - * @see #do_verify() - */ - private void delayedPass2Checks() { - - final int[] instructionPositions = instructionList.getInstructionPositions(); - final int codeLength = code.getCode().length; - - ///////////////////// - // LineNumberTable // - ///////////////////// - final LineNumberTable lnt = code.getLineNumberTable(); - if (lnt != null) { - final LineNumber[] lineNumbers = lnt.getLineNumberTable(); - final IntList offsets = new IntList(); - lineNumber_loop: - for (final LineNumber lineNumber : lineNumbers) { // may appear in any order. - for (final int instructionPosition : instructionPositions) { - // TODO: Make this a binary search! The instructionPositions array is naturally ordered! - final int offset = lineNumber.getStartPC(); - if (instructionPosition == offset) { - if (offsets.contains(offset)) { - addMessage("LineNumberTable attribute '" + code.getLineNumberTable() + - "' refers to the same code offset ('" + offset + "') more than once" + - " which is violating the semantics [but is sometimes produced by IBM's 'jikes' compiler]."); - } else { - offsets.add(offset); - } - continue lineNumber_loop; - } - } - throw new ClassConstraintException("Code attribute '" + code + "' has a LineNumberTable attribute '" + - code.getLineNumberTable() + - "' referring to a code offset ('" + lineNumber.getStartPC() + "') that does not exist."); - } - } - - /////////////////////////// - // LocalVariableTable(s) // - /////////////////////////// - /* We cannot use code.getLocalVariableTable() because there could be more - than only one. This is a bug in BCEL. */ - final Attribute[] atts = code.getAttributes(); - for (final Attribute att : atts) { - if (att instanceof LocalVariableTable) { - final LocalVariableTable lvt = (LocalVariableTable) att; - final LocalVariable[] localVariables = lvt.getLocalVariableTable(); - for (final LocalVariable localVariable : localVariables) { - final int startpc = localVariable.getStartPC(); - final int length = localVariable.getLength(); - - if (!contains(instructionPositions, startpc)) { - throw new ClassConstraintException("Code attribute '" + code - + "' has a LocalVariableTable attribute '" + code.getLocalVariableTable() - + "' referring to a code offset ('" + startpc + "') that does not exist."); - } - if ((!contains(instructionPositions, startpc + length)) && (startpc + length != codeLength)) { - throw new ClassConstraintException("Code attribute '" + code - + "' has a LocalVariableTable attribute '" + code.getLocalVariableTable() - + "' referring to a code offset start_pc+length ('" + (startpc + length) - + "') that does not exist."); - } - } - } - } - - //////////////////// - // ExceptionTable // - //////////////////// - // In BCEL's "classfile" API, the startPC/endPC-notation is - // inclusive/exclusive as in the Java Virtual Machine Specification. - // WARNING: This is not true for BCEL's "generic" API. - final CodeException[] exceptionTable = code.getExceptionTable(); - for (final CodeException element : exceptionTable) { - final int startpc = element.getStartPC(); - final int endpc = element.getEndPC(); - final int handlerpc = element.getHandlerPC(); - if (startpc >= endpc) { - throw new ClassConstraintException("Code attribute '"+code+"' has an exception_table entry '"+element+ - "' that has its start_pc ('"+startpc+"') not smaller than its end_pc ('"+endpc+"')."); - } - if (!contains(instructionPositions, startpc)) { - throw new ClassConstraintException("Code attribute '"+code+"' has an exception_table entry '"+element+ - "' that has a non-existant bytecode offset as its start_pc ('"+startpc+"')."); - } - if ( (!contains(instructionPositions, endpc)) && (endpc != codeLength)) { - throw new ClassConstraintException("Code attribute '"+code+"' has an exception_table entry '"+element+ - "' that has a non-existant bytecode offset as its end_pc ('"+startpc+ - "') [that is also not equal to code_length ('"+codeLength+"')]."); - } - if (!contains(instructionPositions, handlerpc)) { - throw new ClassConstraintException("Code attribute '"+code+"' has an exception_table entry '"+element+ - "' that has a non-existant bytecode offset as its handler_pc ('"+handlerpc+"')."); - } - } - } - - /** - * These are the checks if constraints are satisfied which are described in the - * Java Virtual Machine Specification, Second Edition as Static Constraints on - * the instructions of Java Virtual Machine Code (chapter 4.8.1). - * - * @throws StaticCodeConstraintException if the verification fails. - */ - private void pass3StaticInstructionChecks() { - - // Code array must not be empty: - // Enforced in pass 2 (also stated in the static constraints of the Code - // array in vmspec2), together with pass 1 (reading code_length bytes and - // interpreting them as code[]). So this must not be checked again here. - - if (code.getCode().length >= Const.MAX_CODE_SIZE) {// length must be LESS than the max - throw new StaticCodeInstructionConstraintException( - "Code array in code attribute '"+code+"' too big: must be smaller than "+Const.MAX_CODE_SIZE+"65536 bytes."); - } - - // First opcode at offset 0: okay, that's clear. Nothing to do. - - // Only instances of the instructions documented in Section 6.4 may appear in - // the code array. - - // For BCEL's sake, we cannot handle WIDE stuff, but hopefully BCEL does its job right :) - - // The last byte of the last instruction in the code array must be the byte at index - // code_length-1 : See the do_verify() comments. We actually don't iterate through the - // byte array, but use an InstructionList so we cannot check for this. But BCEL does - // things right, so it's implicitly okay. - - // TODO: Check how BCEL handles (and will handle) instructions like IMPDEP1, IMPDEP2, - // BREAKPOINT... that BCEL knows about but which are illegal anyway. - // We currently go the safe way here. - InstructionHandle ih = instructionList.getStart(); - while (ih != null) { - final Instruction i = ih.getInstruction(); - if (i instanceof IMPDEP1) { - throw new StaticCodeInstructionConstraintException( - "IMPDEP1 must not be in the code, it is an illegal instruction for _internal_ JVM use!"); - } - if (i instanceof IMPDEP2) { - throw new StaticCodeInstructionConstraintException( - "IMPDEP2 must not be in the code, it is an illegal instruction for _internal_ JVM use!"); - } - if (i instanceof BREAKPOINT) { - throw new StaticCodeInstructionConstraintException( - "BREAKPOINT must not be in the code, it is an illegal instruction for _internal_ JVM use!"); - } - ih = ih.getNext(); - } - - // The original verifier seems to do this check here, too. - // An unreachable last instruction may also not fall through the - // end of the code, which is stupid -- but with the original - // verifier's subroutine semantics one cannot predict reachability. - final Instruction last = instructionList.getEnd().getInstruction(); - if (! ((last instanceof ReturnInstruction) || - (last instanceof RET) || - (last instanceof GotoInstruction) || - (last instanceof ATHROW) )) { - throw new StaticCodeInstructionConstraintException( - "Execution must not fall off the bottom of the code array."+ - " This constraint is enforced statically as some existing verifiers do"+ - " - so it may be a false alarm if the last instruction is not reachable."); - } - } - - /** - * These are the checks for the satisfaction of constraints which are described in the - * Java Virtual Machine Specification, Second Edition as Static Constraints on - * the operands of instructions of Java Virtual Machine Code (chapter 4.8.1). - * BCEL parses the code array to create an InstructionList and therefore has to check - * some of these constraints. Additional checks are also implemented here. - * - * @throws StaticCodeConstraintException if the verification fails. - */ - private void pass3StaticInstructionOperandsChecks() { - try { - // When building up the InstructionList, BCEL has already done all those checks - // mentioned in The Java Virtual Machine Specification, Second Edition, as - // "static constraints on the operands of instructions in the code array". - // TODO: see the do_verify() comments. Maybe we should really work on the - // byte array first to give more comprehensive messages. - // TODO: Review Exception API, possibly build in some "offending instruction" thing - // when we're ready to insulate the offending instruction by doing the - // above thing. - - // TODO: Implement as much as possible here. BCEL does _not_ check everything. - - final ConstantPoolGen cpg = new ConstantPoolGen(Repository.lookupClass(myOwner.getClassName()).getConstantPool()); - final InstOperandConstraintVisitor v = new InstOperandConstraintVisitor(cpg); - - // Checks for the things BCEL does _not_ handle itself. - InstructionHandle ih = instructionList.getStart(); - while (ih != null) { - final Instruction i = ih.getInstruction(); - - // An "own" constraint, due to JustIce's new definition of what "subroutine" means. - if (i instanceof JsrInstruction) { - final InstructionHandle target = ((JsrInstruction) i).getTarget(); - if (target == instructionList.getStart()) { - throw new StaticCodeInstructionOperandConstraintException( - "Due to JustIce's clear definition of subroutines, no JSR or JSR_W may have a top-level instruction"+ - " (such as the very first instruction, which is targeted by instruction '"+ih+"' as its target."); - } - if (!(target.getInstruction() instanceof ASTORE)) { - throw new StaticCodeInstructionOperandConstraintException( - "Due to JustIce's clear definition of subroutines, no JSR or JSR_W may target anything else"+ - " than an ASTORE instruction. Instruction '"+ih+"' targets '"+target+"'."); - } - } - - // vmspec2, page 134-137 - ih.accept(v); - - ih = ih.getNext(); - } - - } catch (final ClassNotFoundException e) { - // FIXME: maybe not the best way to handle this - throw new AssertionViolatedException("Missing class: " + e, e); - } - } - - /** A small utility method returning if a given int i is in the given int[] ints. */ - private static boolean contains(final int[] ints, final int i) { - for (final int k : ints) { - if (k==i) { - return true; - } - } - return false; - } - - /** Returns the method number as supplied when instantiating. */ - public int getMethodNo() { - return methodNo; - } - - /** - * This visitor class does the actual checking for the instruction - * operand's constraints. - */ - private class InstOperandConstraintVisitor extends org.apache.bcel.generic.EmptyVisitor { - /** The ConstantPoolGen instance this Visitor operates on. */ - private final ConstantPoolGen constantPoolGen; - - /** The only Constructor. */ - InstOperandConstraintVisitor(final ConstantPoolGen constantPoolGen) { - this.constantPoolGen = constantPoolGen; - } - - /** - * Utility method to return the max_locals value of the method verified - * by the surrounding Pass3aVerifier instance. - */ - private int max_locals() { - try { - return Repository.lookupClass(myOwner.getClassName()).getMethods()[methodNo].getCode().getMaxLocals(); - } catch (final ClassNotFoundException e) { - // FIXME: maybe not the best way to handle this - throw new AssertionViolatedException("Missing class: " + e, e); - } - } - - /** - * A utility method to always raise an exeption. - */ - private void constraintViolated(final Instruction i, final String message) { - throw new StaticCodeInstructionOperandConstraintException("Instruction "+i+" constraint violated: "+message); - } - - /** - * A utility method to raise an exception if the index is not - * a valid constant pool index. - */ - private void indexValid(final Instruction i, final int idx) { - if (idx < 0 || idx >= constantPoolGen.getSize()) { - constraintViolated(i, "Illegal constant pool index '"+idx+"'."); - } - } - - /////////////////////////////////////////////////////////// - // The Java Virtual Machine Specification, pages 134-137 // - /////////////////////////////////////////////////////////// - /** - * Assures the generic preconditions of a LoadClass instance. - * The referenced class is loaded and pass2-verified. - */ - @Override - public void visitLoadClass(final LoadClass loadClass) { - final ObjectType t = loadClass.getLoadClassType(constantPoolGen); - if (t != null) {// null means "no class is loaded" - final Verifier v = VerifierFactory.getVerifier(t.getClassName()); - final VerificationResult vr = v.doPass1(); - if (vr.getStatus() != VerificationResult.VERIFIED_OK) { - constraintViolated((Instruction) loadClass, - "Class '"+loadClass.getLoadClassType(constantPoolGen).getClassName()+"' is referenced, but cannot be loaded: '"+vr+"'."); - } - } - } - - // The target of each jump and branch instruction [...] must be the opcode [...] - // BCEL _DOES_ handle this. - - // tableswitch: BCEL will do it, supposedly. - - // lookupswitch: BCEL will do it, supposedly. - - /** Checks if the constraints of operands of the said instruction(s) are satisfied. */ - // LDC and LDC_W (LDC_W is a subclass of LDC in BCEL's model) - @Override - public void visitLDC(final LDC ldc) { - indexValid(ldc, ldc.getIndex()); - final Constant c = constantPoolGen.getConstant(ldc.getIndex()); - if (c instanceof ConstantClass) { - addMessage("Operand of LDC or LDC_W is CONSTANT_Class '"+c+"' - this is only supported in JDK 1.5 and higher."); - } - else{ - if (! ( (c instanceof ConstantInteger) || - (c instanceof ConstantFloat) || - (c instanceof ConstantString) ) ) { - constraintViolated(ldc, - "Operand of LDC or LDC_W must be one of CONSTANT_Integer, CONSTANT_Float or CONSTANT_String, but is '"+c+"'."); - } - } - } - - /** Checks if the constraints of operands of the said instruction(s) are satisfied. */ - // LDC2_W - @Override - public void visitLDC2_W(final LDC2_W o) { - indexValid(o, o.getIndex()); - final Constant c = constantPoolGen.getConstant(o.getIndex()); - if (! ( (c instanceof ConstantLong) || - (c instanceof ConstantDouble) ) ) { - constraintViolated(o, "Operand of LDC2_W must be CONSTANT_Long or CONSTANT_Double, but is '"+c+"'."); - } - try{ - indexValid(o, o.getIndex()+1); - } - catch(final StaticCodeInstructionOperandConstraintException e) { - throw new AssertionViolatedException("Does not BCEL handle that? LDC2_W operand has a problem.", e); - } - } - - private ObjectType getObjectType(final FieldInstruction o) { - final ReferenceType rt = o.getReferenceType(constantPoolGen); - if(rt instanceof ObjectType) { - return (ObjectType)rt; - } - constraintViolated(o, "expecting ObjectType but got "+rt); - return null; - } - - /** Checks if the constraints of operands of the said instruction(s) are satisfied. */ - //getfield, putfield, getstatic, putstatic - @Override - public void visitFieldInstruction(final FieldInstruction o) { - try { - indexValid(o, o.getIndex()); - final Constant c = constantPoolGen.getConstant(o.getIndex()); - if (! (c instanceof ConstantFieldref)) { - constraintViolated(o, "Indexing a constant that's not a CONSTANT_Fieldref but a '"+c+"'."); - } - - final String field_name = o.getFieldName(constantPoolGen); - - final JavaClass jc = Repository.lookupClass(getObjectType(o).getClassName()); - Field[] fields = jc.getFields(); - Field f = null; - for (final Field field : fields) { - if (field.getName().equals(field_name)) { - final Type f_type = Type.getType(field.getSignature()); - final Type o_type = o.getType(constantPoolGen); - /* TODO: Check if assignment compatibility is sufficient. - * What does Sun do? - */ - if (f_type.equals(o_type)) { - f = field; - break; - } - } - } - if (f == null) { - final JavaClass[] superclasses = jc.getSuperClasses(); - outer: - for (final JavaClass superclass : superclasses) { - fields = superclass.getFields(); - for (final Field field : fields) { - if (field.getName().equals(field_name)) { - final Type f_type = Type.getType(field.getSignature()); - final Type o_type = o.getType(constantPoolGen); - if (f_type.equals(o_type)) { - f = field; - if ((f.getAccessFlags() & (Const.ACC_PUBLIC | Const.ACC_PROTECTED)) == 0) { - f = null; - } - break outer; - } - } - } - } - if (f == null) { - constraintViolated(o, "Referenced field '"+field_name+"' does not exist in class '"+jc.getClassName()+"'."); - } - } - else{ - /* TODO: Check if assignment compatibility is sufficient. - What does Sun do? */ - Type.getType(f.getSignature()); - o.getType(constantPoolGen); -// Type f_type = Type.getType(f.getSignature()); -// Type o_type = o.getType(cpg); - - // Argh. Sun's implementation allows us to have multiple fields of - // the same name but with a different signature. - //if (! f_type.equals(o_type)) { - // constraintViolated(o, - // "Referenced field '"+field_name+"' has type '"+f_type+"' instead of '"+o_type+"' as expected."); - //} - - /* TODO: Check for access modifiers here. */ - } - } catch (final ClassNotFoundException e) { - // FIXME: maybe not the best way to handle this - throw new AssertionViolatedException("Missing class: " + e, e); - } - } - - /** Checks if the constraints of operands of the said instruction(s) are satisfied. */ - @Override - public void visitInvokeInstruction(final InvokeInstruction o) { - indexValid(o, o.getIndex()); - if ( (o instanceof INVOKEVIRTUAL) || - (o instanceof INVOKESPECIAL) || - (o instanceof INVOKESTATIC) ) { - final Constant c = constantPoolGen.getConstant(o.getIndex()); - if (! (c instanceof ConstantMethodref)) { - constraintViolated(o, "Indexing a constant that's not a CONSTANT_Methodref but a '"+c+"'."); - } - else{ - // Constants are okay due to pass2. - final ConstantNameAndType cnat = (ConstantNameAndType) (constantPoolGen.getConstant(((ConstantMethodref) c).getNameAndTypeIndex())); - final ConstantUtf8 cutf8 = (ConstantUtf8) (constantPoolGen.getConstant(cnat.getNameIndex())); - if (cutf8.getBytes().equals(Const.CONSTRUCTOR_NAME) && (!(o instanceof INVOKESPECIAL)) ) { - constraintViolated(o, "Only INVOKESPECIAL is allowed to invoke instance initialization methods."); - } - if ( (! (cutf8.getBytes().equals(Const.CONSTRUCTOR_NAME)) ) && (cutf8.getBytes().startsWith("<")) ) { - constraintViolated(o, - "No method with a name beginning with '<' other than the instance initialization methods"+ - " may be called by the method invocation instructions."); - } - } - } - else{ //if (o instanceof INVOKEINTERFACE) { - final Constant c = constantPoolGen.getConstant(o.getIndex()); - if (! (c instanceof ConstantInterfaceMethodref)) { - constraintViolated(o, "Indexing a constant that's not a CONSTANT_InterfaceMethodref but a '"+c+"'."); - } - // TODO: From time to time check if BCEL allows to detect if the - // 'count' operand is consistent with the information in the - // CONSTANT_InterfaceMethodref and if the last operand is zero. - // By now, BCEL hides those two operands because they're superfluous. - - // Invoked method must not be or - final ConstantNameAndType cnat = - (ConstantNameAndType) (constantPoolGen.getConstant(((ConstantInterfaceMethodref)c).getNameAndTypeIndex())); - final String name = ((ConstantUtf8) (constantPoolGen.getConstant(cnat.getNameIndex()))).getBytes(); - if (name.equals(Const.CONSTRUCTOR_NAME)) { - constraintViolated(o, "Method to invoke must not be '"+Const.CONSTRUCTOR_NAME+"'."); - } - if (name.equals(Const.STATIC_INITIALIZER_NAME)) { - constraintViolated(o, "Method to invoke must not be '"+Const.STATIC_INITIALIZER_NAME+"'."); - } - } - - // The LoadClassType is the method-declaring class, so we have to check the other types. - - Type t = o.getReturnType(constantPoolGen); - if (t instanceof ArrayType) { - t = ((ArrayType) t).getBasicType(); - } - if (t instanceof ObjectType) { - final Verifier v = VerifierFactory.getVerifier(((ObjectType) t).getClassName()); - final VerificationResult vr = v.doPass2(); - if (vr.getStatus() != VerificationResult.VERIFIED_OK) { - constraintViolated(o, "Return type class/interface could not be verified successfully: '"+vr.getMessage()+"'."); - } - } - - final Type[] ts = o.getArgumentTypes(constantPoolGen); - for (final Type element : ts) { - t = element; - if (t instanceof ArrayType) { - t = ((ArrayType) t).getBasicType(); - } - if (t instanceof ObjectType) { - final Verifier v = VerifierFactory.getVerifier(((ObjectType) t).getClassName()); - final VerificationResult vr = v.doPass2(); - if (vr.getStatus() != VerificationResult.VERIFIED_OK) { - constraintViolated(o, - "Argument type class/interface could not be verified successfully: '"+vr.getMessage()+"'."); - } - } - } - - } - - /** Checks if the constraints of operands of the said instruction(s) are satisfied. */ - @Override - public void visitINSTANCEOF(final INSTANCEOF o) { - indexValid(o, o.getIndex()); - final Constant c = constantPoolGen.getConstant(o.getIndex()); - if (! (c instanceof ConstantClass)) { - constraintViolated(o, "Expecting a CONSTANT_Class operand, but found a '"+c+"'."); - } - } - - /** Checks if the constraints of operands of the said instruction(s) are satisfied. */ - @Override - public void visitCHECKCAST(final CHECKCAST o) { - indexValid(o, o.getIndex()); - final Constant c = constantPoolGen.getConstant(o.getIndex()); - if (! (c instanceof ConstantClass)) { - constraintViolated(o, "Expecting a CONSTANT_Class operand, but found a '"+c+"'."); - } - } - - /** Checks if the constraints of operands of the said instruction(s) are satisfied. */ - @Override - public void visitNEW(final NEW o) { - indexValid(o, o.getIndex()); - final Constant c = constantPoolGen.getConstant(o.getIndex()); - if (! (c instanceof ConstantClass)) { - constraintViolated(o, "Expecting a CONSTANT_Class operand, but found a '"+c+"'."); - } - else{ - final ConstantUtf8 cutf8 = (ConstantUtf8) (constantPoolGen.getConstant( ((ConstantClass) c).getNameIndex() )); - final Type t = Type.getType("L"+cutf8.getBytes()+";"); - if (t instanceof ArrayType) { - constraintViolated(o, "NEW must not be used to create an array."); - } - } - - } - - /** Checks if the constraints of operands of the said instruction(s) are satisfied. */ - @Override - public void visitMULTIANEWARRAY(final MULTIANEWARRAY o) { - indexValid(o, o.getIndex()); - final Constant c = constantPoolGen.getConstant(o.getIndex()); - if (! (c instanceof ConstantClass)) { - constraintViolated(o, "Expecting a CONSTANT_Class operand, but found a '"+c+"'."); - } - final int dimensions2create = o.getDimensions(); - if (dimensions2create < 1) { - constraintViolated(o, "Number of dimensions to create must be greater than zero."); - } - final Type t = o.getType(constantPoolGen); - if (t instanceof ArrayType) { - final int dimensions = ((ArrayType) t).getDimensions(); - if (dimensions < dimensions2create) { - constraintViolated(o, - "Not allowed to create array with more dimensions ('"+dimensions2create+ - "') than the one referenced by the CONSTANT_Class '"+t+"'."); - } - } - else{ - constraintViolated(o, "Expecting a CONSTANT_Class referencing an array type."+ - " [Constraint not found in The Java Virtual Machine Specification, Second Edition, 4.8.1]"); - } - } - - /** Checks if the constraints of operands of the said instruction(s) are satisfied. */ - @Override - public void visitANEWARRAY(final ANEWARRAY o) { - indexValid(o, o.getIndex()); - final Constant c = constantPoolGen.getConstant(o.getIndex()); - if (! (c instanceof ConstantClass)) { - constraintViolated(o, "Expecting a CONSTANT_Class operand, but found a '"+c+"'."); - } - final Type t = o.getType(constantPoolGen); - if (t instanceof ArrayType) { - final int dimensions = ((ArrayType) t).getDimensions(); - if (dimensions > Const.MAX_ARRAY_DIMENSIONS) { - constraintViolated(o, - "Not allowed to create an array with more than "+ Const.MAX_ARRAY_DIMENSIONS + " dimensions;"+ - " actual: " + dimensions); - } - } - } - - /** Checks if the constraints of operands of the said instruction(s) are satisfied. */ - @Override - public void visitNEWARRAY(final NEWARRAY o) { - final byte t = o.getTypecode(); - if (! ( (t == Const.T_BOOLEAN) || - (t == Const.T_CHAR) || - (t == Const.T_FLOAT) || - (t == Const.T_DOUBLE) || - (t == Const.T_BYTE) || - (t == Const.T_SHORT) || - (t == Const.T_INT) || - (t == Const.T_LONG) ) ) { - constraintViolated(o, "Illegal type code '+t+' for 'atype' operand."); - } - } - - /** Checks if the constraints of operands of the said instruction(s) are satisfied. */ - @Override - public void visitILOAD(final ILOAD o) { - final int idx = o.getIndex(); - if (idx < 0) { - constraintViolated(o, "Index '"+idx+"' must be non-negative."); - } - else{ - final int maxminus1 = max_locals()-1; - if (idx > maxminus1) { - constraintViolated(o, "Index '"+idx+"' must not be greater than max_locals-1 '"+maxminus1+"'."); - } - } - } - - /** Checks if the constraints of operands of the said instruction(s) are satisfied. */ - @Override - public void visitFLOAD(final FLOAD o) { - final int idx = o.getIndex(); - if (idx < 0) { - constraintViolated(o, "Index '"+idx+"' must be non-negative."); - } - else{ - final int maxminus1 = max_locals()-1; - if (idx > maxminus1) { - constraintViolated(o, "Index '"+idx+"' must not be greater than max_locals-1 '"+maxminus1+"'."); - } - } - } - - /** Checks if the constraints of operands of the said instruction(s) are satisfied. */ - @Override - public void visitALOAD(final ALOAD o) { - final int idx = o.getIndex(); - if (idx < 0) { - constraintViolated(o, "Index '"+idx+"' must be non-negative."); - } - else{ - final int maxminus1 = max_locals()-1; - if (idx > maxminus1) { - constraintViolated(o, "Index '"+idx+"' must not be greater than max_locals-1 '"+maxminus1+"'."); - } - } - } - - /** Checks if the constraints of operands of the said instruction(s) are satisfied. */ - @Override - public void visitISTORE(final ISTORE o) { - final int idx = o.getIndex(); - if (idx < 0) { - constraintViolated(o, "Index '"+idx+"' must be non-negative."); - } - else{ - final int maxminus1 = max_locals()-1; - if (idx > maxminus1) { - constraintViolated(o, "Index '"+idx+"' must not be greater than max_locals-1 '"+maxminus1+"'."); - } - } - } - - /** Checks if the constraints of operands of the said instruction(s) are satisfied. */ - @Override - public void visitFSTORE(final FSTORE o) { - final int idx = o.getIndex(); - if (idx < 0) { - constraintViolated(o, "Index '"+idx+"' must be non-negative."); - } - else{ - final int maxminus1 = max_locals()-1; - if (idx > maxminus1) { - constraintViolated(o, "Index '"+idx+"' must not be greater than max_locals-1 '"+maxminus1+"'."); - } - } - } - - /** Checks if the constraints of operands of the said instruction(s) are satisfied. */ - @Override - public void visitASTORE(final ASTORE o) { - final int idx = o.getIndex(); - if (idx < 0) { - constraintViolated(o, "Index '"+idx+"' must be non-negative."); - } - else{ - final int maxminus1 = max_locals()-1; - if (idx > maxminus1) { - constraintViolated(o, "Index '"+idx+"' must not be greater than max_locals-1 '"+maxminus1+"'."); - } - } - } - - /** Checks if the constraints of operands of the said instruction(s) are satisfied. */ - @Override - public void visitIINC(final IINC o) { - final int idx = o.getIndex(); - if (idx < 0) { - constraintViolated(o, "Index '"+idx+"' must be non-negative."); - } - else{ - final int maxminus1 = max_locals()-1; - if (idx > maxminus1) { - constraintViolated(o, "Index '"+idx+"' must not be greater than max_locals-1 '"+maxminus1+"'."); - } - } - } - - /** Checks if the constraints of operands of the said instruction(s) are satisfied. */ - @Override - public void visitRET(final RET o) { - final int idx = o.getIndex(); - if (idx < 0) { - constraintViolated(o, "Index '"+idx+"' must be non-negative."); - } - else{ - final int maxminus1 = max_locals()-1; - if (idx > maxminus1) { - constraintViolated(o, "Index '"+idx+"' must not be greater than max_locals-1 '"+maxminus1+"'."); - } - } - } - - /** Checks if the constraints of operands of the said instruction(s) are satisfied. */ - @Override - public void visitLLOAD(final LLOAD o) { - final int idx = o.getIndex(); - if (idx < 0) { - constraintViolated(o, "Index '"+idx+"' must be non-negative."+ - " [Constraint by JustIce as an analogon to the single-slot xLOAD/xSTORE instructions; may not happen anyway.]"); - } - else{ - final int maxminus2 = max_locals()-2; - if (idx > maxminus2) { - constraintViolated(o, "Index '"+idx+"' must not be greater than max_locals-2 '"+maxminus2+"'."); - } - } - } - - /** Checks if the constraints of operands of the said instruction(s) are satisfied. */ - @Override - public void visitDLOAD(final DLOAD o) { - final int idx = o.getIndex(); - if (idx < 0) { - constraintViolated(o, "Index '"+idx+"' must be non-negative."+ - " [Constraint by JustIce as an analogon to the single-slot xLOAD/xSTORE instructions; may not happen anyway.]"); - } - else{ - final int maxminus2 = max_locals()-2; - if (idx > maxminus2) { - constraintViolated(o, "Index '"+idx+"' must not be greater than max_locals-2 '"+maxminus2+"'."); - } - } - } - - /** Checks if the constraints of operands of the said instruction(s) are satisfied. */ - @Override - public void visitLSTORE(final LSTORE o) { - final int idx = o.getIndex(); - if (idx < 0) { - constraintViolated(o, "Index '"+idx+"' must be non-negative."+ - " [Constraint by JustIce as an analogon to the single-slot xLOAD/xSTORE instructions; may not happen anyway.]"); - } - else{ - final int maxminus2 = max_locals()-2; - if (idx > maxminus2) { - constraintViolated(o, "Index '"+idx+"' must not be greater than max_locals-2 '"+maxminus2+"'."); - } - } - } - - /** Checks if the constraints of operands of the said instruction(s) are satisfied. */ - @Override - public void visitDSTORE(final DSTORE o) { - final int idx = o.getIndex(); - if (idx < 0) { - constraintViolated(o, "Index '"+idx+"' must be non-negative."+ - " [Constraint by JustIce as an analogon to the single-slot xLOAD/xSTORE instructions; may not happen anyway.]"); - } - else{ - final int maxminus2 = max_locals()-2; - if (idx > maxminus2) { - constraintViolated(o, "Index '"+idx+"' must not be greater than max_locals-2 '"+maxminus2+"'."); - } - } - } - - /** Checks if the constraints of operands of the said instruction(s) are satisfied. */ - @Override - public void visitLOOKUPSWITCH(final LOOKUPSWITCH o) { - final int[] matchs = o.getMatchs(); - int max = Integer.MIN_VALUE; - for (int i=0; i= "low". We cannot check this, as BCEL hides - // it from us. - } - - /** Checks if the constraints of operands of the said instruction(s) are satisfied. */ - @Override - public void visitPUTSTATIC(final PUTSTATIC o) { - try { - final String field_name = o.getFieldName(constantPoolGen); - final JavaClass jc = Repository.lookupClass(getObjectType(o).getClassName()); - final Field[] fields = jc.getFields(); - Field f = null; - for (final Field field : fields) { - if (field.getName().equals(field_name)) { - f = field; - break; - } - } - if (f == null) { - throw new AssertionViolatedException("Field '" + field_name + "' not found in " + jc.getClassName()); - } - - if (f.isFinal()) { - if (!(myOwner.getClassName().equals(getObjectType(o).getClassName()))) { - constraintViolated(o, - "Referenced field '"+f+"' is final and must therefore be declared in the current class '"+ - myOwner.getClassName()+"' which is not the case: it is declared in '"+o.getReferenceType(constantPoolGen)+"'."); - } - } - - if (! (f.isStatic())) { - constraintViolated(o, "Referenced field '"+f+"' is not static which it should be."); - } - - final String meth_name = Repository.lookupClass(myOwner.getClassName()).getMethods()[methodNo].getName(); - - // If it's an interface, it can be set only in . - if ((!(jc.isClass())) && (!(meth_name.equals(Const.STATIC_INITIALIZER_NAME)))) { - constraintViolated(o, "Interface field '"+f+"' must be set in a '"+Const.STATIC_INITIALIZER_NAME+"' method."); - } - } catch (final ClassNotFoundException e) { - // FIXME: maybe not the best way to handle this - throw new AssertionViolatedException("Missing class: " + e, e); - } - } - - /** Checks if the constraints of operands of the said instruction(s) are satisfied. */ - @Override - public void visitGETSTATIC(final GETSTATIC o) { - try { - final String field_name = o.getFieldName(constantPoolGen); - final JavaClass jc = Repository.lookupClass(getObjectType(o).getClassName()); - final Field[] fields = jc.getFields(); - Field f = null; - for (final Field field : fields) { - if (field.getName().equals(field_name)) { - f = field; - break; - } - } - if (f == null) { - throw new AssertionViolatedException("Field '" + field_name + "' not found in " + jc.getClassName()); - } - - if (! (f.isStatic())) { - constraintViolated(o, "Referenced field '"+f+"' is not static which it should be."); - } - } catch (final ClassNotFoundException e) { - // FIXME: maybe not the best way to handle this - throw new AssertionViolatedException("Missing class: " + e, e); - } - } - - /* Checks if the constraints of operands of the said instruction(s) are satisfied. */ - //public void visitPUTFIELD(PUTFIELD o) { - // for performance reasons done in Pass 3b - //} - - /* Checks if the constraints of operands of the said instruction(s) are satisfied. */ - //public void visitGETFIELD(GETFIELD o) { - // for performance reasons done in Pass 3b - //} - - /** Checks if the constraints of operands of the said instruction(s) are satisfied. */ - @Override - public void visitINVOKEDYNAMIC(final INVOKEDYNAMIC o) { - throw new UnsupportedOperationException("INVOKEDYNAMIC instruction is not supported at this time"); - } - - /** Checks if the constraints of operands of the said instruction(s) are satisfied. */ - @Override - public void visitINVOKEINTERFACE(final INVOKEINTERFACE o) { - try { - // INVOKEINTERFACE is a LoadClass; the Class where the referenced method is declared in, - // is therefore resolved/verified. - // INVOKEINTERFACE is an InvokeInstruction, the argument and return types are resolved/verified, - // too. So are the allowed method names. - final String classname = o.getClassName(constantPoolGen); - final JavaClass jc = Repository.lookupClass(classname); - final Method m = getMethodRecursive(jc, o); - if (m == null) { - constraintViolated(o, "Referenced method '"+o.getMethodName(constantPoolGen)+"' with expected signature '"+o.getSignature(constantPoolGen)+ - "' not found in class '"+jc.getClassName()+"'."); - } - if (jc.isClass()) { - constraintViolated(o, "Referenced class '"+jc.getClassName()+"' is a class, but not an interface as expected."); - } - } catch (final ClassNotFoundException e) { - // FIXME: maybe not the best way to handle this - throw new AssertionViolatedException("Missing class: " + e, e); - } - } - - /** - * Looks for the method referenced by the given invoke instruction in the given class - * or its super classes and super interfaces. - * @param jc the class that defines the referenced method - * @param invoke the instruction that references the method - * @return the referenced method or null if not found. - */ - private Method getMethodRecursive(final JavaClass jc, final InvokeInstruction invoke) throws ClassNotFoundException{ - Method m; - //look in the given class - m = getMethod(jc, invoke); - if(m != null) { - //method found in given class - return m; - } - //method not found, look in super classes - for (final JavaClass superclass : jc.getSuperClasses()) { - m = getMethod(superclass, invoke); - if(m != null) { - //method found in super class - return m; - } - } - //method not found, look in super interfaces - for (final JavaClass superclass : jc.getInterfaces()) { - m = getMethod(superclass, invoke); - if(m != null) { - //method found in super interface - return m; - } - } - //method not found in the hierarchy - return null; - } - /** - * Looks for the method referenced by the given invoke instruction in the given class. - * @param jc the class that defines the referenced method - * @param invoke the instruction that references the method - * @return the referenced method or null if not found. - */ - private Method getMethod(final JavaClass jc, final InvokeInstruction invoke) { - final Method[] ms = jc.getMethods(); - for (final Method element : ms) { - if ( (element.getName().equals(invoke.getMethodName(constantPoolGen))) && - (Type.getReturnType(element.getSignature()).equals(invoke.getReturnType(constantPoolGen))) && - (objarrayequals(Type.getArgumentTypes(element.getSignature()), invoke.getArgumentTypes(constantPoolGen))) ) { - return element; - } - } - - return null; - } - - /** Checks if the constraints of operands of the said instruction(s) are satisfied. */ - @Override - public void visitINVOKESPECIAL(final INVOKESPECIAL o) { - try { - // INVOKESPECIAL is a LoadClass; the Class where the referenced method is declared in, - // is therefore resolved/verified. - // INVOKESPECIAL is an InvokeInstruction, the argument and return types are resolved/verified, - // too. So are the allowed method names. - final String classname = o.getClassName(constantPoolGen); - final JavaClass jc = Repository.lookupClass(classname); - final Method m = getMethodRecursive(jc, o); - if (m == null) { - constraintViolated(o, "Referenced method '"+o.getMethodName(constantPoolGen)+"' with expected signature '"+o.getSignature(constantPoolGen) - +"' not found in class '"+jc.getClassName()+"'."); - } - - JavaClass current = Repository.lookupClass(myOwner.getClassName()); - if (current.isSuper()) { - - if ((Repository.instanceOf( current, jc )) && (!current.equals(jc))) { - - if (! (o.getMethodName(constantPoolGen).equals(Const.CONSTRUCTOR_NAME) )) { - // Special lookup procedure for ACC_SUPER classes. - - int supidx = -1; - - Method meth = null; - while (supidx != 0) { - supidx = current.getSuperclassNameIndex(); - current = Repository.lookupClass(current.getSuperclassName()); - - final Method[] meths = current.getMethods(); - for (final Method meth2 : meths) { - if ( (meth2.getName().equals(o.getMethodName(constantPoolGen))) && - (Type.getReturnType(meth2.getSignature()).equals(o.getReturnType(constantPoolGen))) && - (objarrayequals(Type.getArgumentTypes(meth2.getSignature()), o.getArgumentTypes(constantPoolGen))) ) { - meth = meth2; - break; - } - } - if (meth != null) { - break; - } - } - if (meth == null) { - constraintViolated(o, "ACC_SUPER special lookup procedure not successful: method '"+ - o.getMethodName(constantPoolGen)+"' with proper signature not declared in superclass hierarchy."); - } - } - } - } - - } catch (final ClassNotFoundException e) { - // FIXME: maybe not the best way to handle this - throw new AssertionViolatedException("Missing class: " + e, e); - } - - } - - /** Checks if the constraints of operands of the said instruction(s) are satisfied. */ - @Override - public void visitINVOKESTATIC(final INVOKESTATIC o) { - try { - // INVOKESTATIC is a LoadClass; the Class where the referenced method is declared in, - // is therefore resolved/verified. - // INVOKESTATIC is an InvokeInstruction, the argument and return types are resolved/verified, - // too. So are the allowed method names. - final String classname = o.getClassName(constantPoolGen); - final JavaClass jc = Repository.lookupClass(classname); - final Method m = getMethodRecursive(jc, o); - if (m == null) { - constraintViolated(o, "Referenced method '"+o.getMethodName(constantPoolGen)+"' with expected signature '"+ - o.getSignature(constantPoolGen) +"' not found in class '"+jc.getClassName()+"'."); - } else if (! (m.isStatic())) { // implies it's not abstract, verified in pass 2. - constraintViolated(o, "Referenced method '"+o.getMethodName(constantPoolGen)+"' has ACC_STATIC unset."); - } - - } catch (final ClassNotFoundException e) { - // FIXME: maybe not the best way to handle this - throw new AssertionViolatedException("Missing class: " + e, e); - } - } - - - /** Checks if the constraints of operands of the said instruction(s) are satisfied. */ - @Override - public void visitINVOKEVIRTUAL(final INVOKEVIRTUAL o) { - try { - // INVOKEVIRTUAL is a LoadClass; the Class where the referenced method is declared in, - // is therefore resolved/verified. - // INVOKEVIRTUAL is an InvokeInstruction, the argument and return types are resolved/verified, - // too. So are the allowed method names. - final String classname = o.getClassName(constantPoolGen); - final JavaClass jc = Repository.lookupClass(classname); - final Method m = getMethodRecursive(jc, o); - if (m == null) { - constraintViolated(o, "Referenced method '"+o.getMethodName(constantPoolGen)+"' with expected signature '"+ - o.getSignature(constantPoolGen)+"' not found in class '"+jc.getClassName()+"'."); - } - if (! (jc.isClass())) { - constraintViolated(o, "Referenced class '"+jc.getClassName()+"' is an interface, but not a class as expected."); - } - - } catch (final ClassNotFoundException e) { - // FIXME: maybe not the best way to handle this - throw new AssertionViolatedException("Missing class: " + e, e); - } - } - - - // WIDE stuff is BCEL-internal and cannot be checked here. - - /** - * A utility method like equals(Object) for arrays. - * The equality of the elements is based on their equals(Object) - * method instead of their object identity. - */ - private boolean objarrayequals(final Object[] o, final Object[] p) { - if (o.length != p.length) { - return false; - } - - for (int i=0; iaccept() Visitor - * instances) have toString() methods that were not designed to be robust, - * this gap is closed by this class. - * When performing class file verification, it may be useful to output which - * entity (e.g. a Code instance) is not satisfying the verifier's - * constraints, but in this case it could be possible for the toString() - * method to throw a RuntimeException. - * A (new StringRepresentation(Node n)).toString() never throws any exception. - * Note that this class also serves as a placeholder for more sophisticated message - * handling in future versions of JustIce. - * - */ -public class StringRepresentation extends org.apache.bcel.classfile.EmptyVisitor { - /** The string representation, created by a visitXXX() method, output by toString(). */ - private String tostring; - /** The node we ask for its string representation. Not really needed; only for debug output. */ - private final Node n; - - /** - * Creates a new StringRepresentation object which is the representation of n. - * - * @param n The node to represent. - * @see #toString() - */ - public StringRepresentation(final Node n) { - this.n = n; - n.accept(this); // assign a string representation to field 'tostring' if we know n's class. - } - - /** - * Returns the String representation. - */ - @Override - public String toString() { -// The run-time check below is needed because we don't want to omit inheritance -// of "EmptyVisitor" and provide a thousand empty methods. -// However, in terms of performance this would be a better idea. -// If some new "Node" is defined in BCEL (such as some concrete "Attribute"), we -// want to know that this class has also to be adapted. - if (tostring == null) { - throw new AssertionViolatedException( - "Please adapt '" + getClass() + "' to deal with objects of class '" + n.getClass() + "'."); - } - return tostring; - } - - /** - * Returns the String representation of the Node object obj; - * this is obj.toString() if it does not throw any RuntimeException, - * or else it is a string derived only from obj's class name. - */ - private String toString(final Node obj) { - String ret; - try { - ret = obj.toString(); - } - - catch (final RuntimeException e) { - // including ClassFormatException, trying to convert the "signature" of a ReturnaddressType LocalVariable - // (shouldn't occur, but people do crazy things) - String s = obj.getClass().getName(); - s = s.substring(s.lastIndexOf(".") + 1); - ret = "<<" + s + ">>"; - } - return ret; - } - - //////////////////////////////// - // Visitor methods start here // - //////////////////////////////// - // We don't of course need to call some default implementation: - // e.g. we could also simply output "Code" instead of a possibly - // lengthy Code attribute's toString(). - @Override - public void visitCode(final Code obj) { - //tostring = toString(obj); - tostring = ""; // We don't need real code outputs. - } - - /** - * @since 6.0 - */ - @Override - public void visitAnnotation(final Annotations obj) - { - //this is invoked whenever an annotation is found - //when verifier is passed over a class - tostring = toString(obj); - } - - /** - * @since 6.0 - */ - @Override - public void visitLocalVariableTypeTable(final LocalVariableTypeTable obj) - { - //this is invoked whenever a local variable type is found - //when verifier is passed over a class - tostring = toString(obj); - } - - @Override - public void visitCodeException(final CodeException obj) { - tostring = toString(obj); - } - - @Override - public void visitConstantClass(final ConstantClass obj) { - tostring = toString(obj); - } - - @Override - public void visitConstantDouble(final ConstantDouble obj) { - tostring = toString(obj); - } - - @Override - public void visitConstantFieldref(final ConstantFieldref obj) { - tostring = toString(obj); - } - - @Override - public void visitConstantFloat(final ConstantFloat obj) { - tostring = toString(obj); - } - - @Override - public void visitConstantInteger(final ConstantInteger obj) { - tostring = toString(obj); - } - - @Override - public void visitConstantInterfaceMethodref(final ConstantInterfaceMethodref obj) { - tostring = toString(obj); - } - - @Override - public void visitConstantLong(final ConstantLong obj) { - tostring = toString(obj); - } - - @Override - public void visitConstantMethodref(final ConstantMethodref obj) { - tostring = toString(obj); - } - - @Override - public void visitConstantNameAndType(final ConstantNameAndType obj) { - tostring = toString(obj); - } - - @Override - public void visitConstantPool(final ConstantPool obj) { - tostring = toString(obj); - } - - @Override - public void visitConstantString(final ConstantString obj) { - tostring = toString(obj); - } - - @Override - public void visitConstantUtf8(final ConstantUtf8 obj) { - tostring = toString(obj); - } - - @Override - public void visitConstantValue(final ConstantValue obj) { - tostring = toString(obj); - } - - @Override - public void visitDeprecated(final Deprecated obj) { - tostring = toString(obj); - } - - @Override - public void visitExceptionTable(final ExceptionTable obj) { - tostring = toString(obj); - } - - @Override - public void visitField(final Field obj) { - tostring = toString(obj); - } - - @Override - public void visitInnerClass(final InnerClass obj) { - tostring = toString(obj); - } - - @Override - public void visitInnerClasses(final InnerClasses obj) { - tostring = toString(obj); - } - - @Override - public void visitJavaClass(final JavaClass obj) { - tostring = toString(obj); - } - - @Override - public void visitLineNumber(final LineNumber obj) { - tostring = toString(obj); - } - - @Override - public void visitLineNumberTable(final LineNumberTable obj) { - tostring = ""; - } - - @Override - public void visitLocalVariable(final LocalVariable obj) { - tostring = toString(obj); - } - - @Override - public void visitLocalVariableTable(final LocalVariableTable obj) { - tostring = ""; - } - - @Override - public void visitMethod(final Method obj) { - tostring = toString(obj); - } - - @Override - public void visitSignature(final Signature obj) { - tostring = toString(obj); - } - - @Override - public void visitSourceFile(final SourceFile obj) { - tostring = toString(obj); - } - - @Override - public void visitStackMap(final StackMap obj) { - tostring = toString(obj); - } - - @Override - public void visitSynthetic(final Synthetic obj) { - tostring = toString(obj); - } - - @Override - public void visitUnknown(final Unknown obj) { - tostring = toString(obj); - } - - /** - * @since 6.0 - */ - @Override - public void visitEnclosingMethod(final EnclosingMethod obj) { - tostring = toString(obj); - } - - /** - * @since 6.0 - */ - @Override - public void visitBootstrapMethods(final BootstrapMethods obj) { - tostring = toString(obj); - } - - /** - * @since 6.0 - */ - @Override - public void visitMethodParameters(final MethodParameters obj) { - tostring = toString(obj); - } - - /** - * @since 6.0 - */ - @Override - public void visitConstantInvokeDynamic(final ConstantInvokeDynamic obj) { - tostring = toString(obj); - } - - /** - * @since 6.0 - */ - @Override - public void visitStackMapEntry(final StackMapEntry obj) { - tostring = toString(obj); - } - /** - * @since 6.0 - */ - - @Override - public void visitParameterAnnotation(final ParameterAnnotations obj) { - tostring = toString(obj); - } - - /** - * @since 6.0 - */ - @Override - public void visitAnnotationEntry(final AnnotationEntry obj) { - tostring = toString(obj); - } - - /** - * @since 6.0 - */ - @Override - public void visitAnnotationDefault(final AnnotationDefault obj) { - tostring = toString(obj); - } - - /** - * @since 6.0 - */ - @Override - public void visitConstantMethodType(final ConstantMethodType obj) { - tostring = toString(obj); - } - - /** - * @since 6.0 - */ - @Override - public void visitConstantMethodHandle(final ConstantMethodHandle obj) { - tostring = toString(obj); - } - - /** - * @since 6.0 - */ - @Override - public void visitParameterAnnotationEntry(final ParameterAnnotationEntry obj) { - tostring = toString(obj); - } - - /** - * @since 6.4.0 - */ - @Override - public void visitNestMembers(final NestMembers obj) { - tostring = toString(obj); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/statics/package.html b/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/statics/package.html deleted file mode 100644 index cfd4bfd5..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/statics/package.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - -Provides PassVerifier classes used internally by JustIce. You don't need to bother with them. - -

Package Specification

- -Contained in this package are PassVerifier classes for use with the JustIce verifier. -Only the passes performing what Sun calls 'static constraints' have PassVerifier classes -here. - - - diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/structurals/ControlFlowGraph.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/structurals/ControlFlowGraph.java deleted file mode 100644 index 62c0fce8..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/structurals/ControlFlowGraph.java +++ /dev/null @@ -1,476 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.verifier.structurals; - - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apache.bcel.generic.ATHROW; -import org.apache.bcel.generic.BranchInstruction; -import org.apache.bcel.generic.GotoInstruction; -import org.apache.bcel.generic.Instruction; -import org.apache.bcel.generic.InstructionHandle; -import org.apache.bcel.generic.JsrInstruction; -import org.apache.bcel.generic.MethodGen; -import org.apache.bcel.generic.RET; -import org.apache.bcel.generic.ReturnInstruction; -import org.apache.bcel.generic.Select; -import org.apache.bcel.verifier.exc.AssertionViolatedException; -import org.apache.bcel.verifier.exc.StructuralCodeConstraintException; - -/** - * This class represents a control flow graph of a method. - * - */ -public class ControlFlowGraph{ - - /** - * Objects of this class represent a node in a ControlFlowGraph. - * These nodes are instructions, not basic blocks. - */ - private class InstructionContextImpl implements InstructionContext{ - - /** - * The TAG field is here for external temporary flagging, such - * as graph colouring. - * - * @see #getTag() - * @see #setTag(int) - */ - private int TAG; - - /** - * The InstructionHandle this InstructionContext is wrapped around. - */ - private final InstructionHandle instruction; - - /** - * The 'incoming' execution Frames. - */ - private final Map inFrames; // key: the last-executed JSR - - /** - * The 'outgoing' execution Frames. - */ - private final Map outFrames; // key: the last-executed JSR - - /** - * The 'execution predecessors' - a list of type InstructionContext - * of those instances that have been execute()d before in that order. - */ - private List executionPredecessors = null; // Type: InstructionContext - - /** - * Creates an InstructionHandleImpl object from an InstructionHandle. - * Creation of one per InstructionHandle suffices. Don't create more. - */ - public InstructionContextImpl(final InstructionHandle inst) { - if (inst == null) { - throw new AssertionViolatedException("Cannot instantiate InstructionContextImpl from NULL."); - } - - instruction = inst; - inFrames = new HashMap<>(); - outFrames = new HashMap<>(); - } - - /* Satisfies InstructionContext.getTag(). */ - @Override - public int getTag() { - return TAG; - } - - /* Satisfies InstructionContext.setTag(int). */ - @Override - public void setTag(final int tag) { // part of InstructionContext interface - TAG = tag; - } - - /** - * Returns the exception handlers of this instruction. - */ - @Override - public ExceptionHandler[] getExceptionHandlers() { - return exceptionhandlers.getExceptionHandlers(getInstruction()); - } - - /** - * Returns a clone of the "outgoing" frame situation with respect to the given ExecutionChain. - */ - @Override - public Frame getOutFrame(final ArrayList execChain) { - executionPredecessors = execChain; - - Frame org; - - final InstructionContext jsr = lastExecutionJSR(); - - org = outFrames.get(jsr); - - if (org == null) { - throw new AssertionViolatedException( - "outFrame not set! This:\n"+this+"\nExecutionChain: "+getExecutionChain()+"\nOutFrames: '"+outFrames+"'."); - } - return org.getClone(); - } - - @Override - public Frame getInFrame() { - Frame org; - - final InstructionContext jsr = lastExecutionJSR(); - - org = inFrames.get(jsr); - - if (org == null) { - throw new AssertionViolatedException("inFrame not set! This:\n"+this+"\nInFrames: '"+inFrames+"'."); - } - return org.getClone(); - } - - /** - * "Merges in" (vmspec2, page 146) the "incoming" frame situation; - * executes the instructions symbolically - * and therefore calculates the "outgoing" frame situation. - * Returns: True iff the "incoming" frame situation changed after - * merging with "inFrame". - * The execPreds ArrayList must contain the InstructionContext - * objects executed so far in the correct order. This is just - * one execution path [out of many]. This is needed to correctly - * "merge" in the special case of a RET's successor. - * The InstConstraintVisitor and ExecutionVisitor instances - * must be set up correctly. - * @return true - if and only if the "outgoing" frame situation - * changed from the one before execute()ing. - */ - @Override - public boolean execute(final Frame inFrame, final ArrayList execPreds, final InstConstraintVisitor icv, final ExecutionVisitor ev) { - - @SuppressWarnings("unchecked") // OK because execPreds is compatible type - final List clone = (List) execPreds.clone(); - executionPredecessors = clone; - - //sanity check - if ( (lastExecutionJSR() == null) && (subroutines.subroutineOf(getInstruction()) != subroutines.getTopLevel() ) ) { - throw new AssertionViolatedException("Huh?! Am I '"+this+"' part of a subroutine or not?"); - } - if ( (lastExecutionJSR() != null) && (subroutines.subroutineOf(getInstruction()) == subroutines.getTopLevel() ) ) { - throw new AssertionViolatedException("Huh?! Am I '"+this+"' part of a subroutine or not?"); - } - - Frame inF = inFrames.get(lastExecutionJSR()); - if (inF == null) {// no incoming frame was set, so set it. - inFrames.put(lastExecutionJSR(), inFrame); - inF = inFrame; - } - else{// if there was an "old" inFrame - if (inF.equals(inFrame)) { //shortcut: no need to merge equal frames. - return false; - } - if (! mergeInFrames(inFrame)) { - return false; - } - } - - // Now we're sure the inFrame has changed! - - // new inFrame is already merged in, see above. - final Frame workingFrame = inF.getClone(); - - try{ - // This verifies the InstructionConstraint for the current - // instruction, but does not modify the workingFrame object. -//InstConstraintVisitor icv = InstConstraintVisitor.getInstance(VerifierFactory.getVerifier(method_gen.getClassName())); - icv.setFrame(workingFrame); - getInstruction().accept(icv); - } - catch(final StructuralCodeConstraintException ce) { - ce.extendMessage("","\nInstructionHandle: "+getInstruction()+"\n"); - ce.extendMessage("","\nExecution Frame:\n"+workingFrame); - extendMessageWithFlow(ce); - throw ce; - } - - // This executes the Instruction. - // Therefore the workingFrame object is modified. -//ExecutionVisitor ev = ExecutionVisitor.getInstance(VerifierFactory.getVerifier(method_gen.getClassName())); - ev.setFrame(workingFrame); - getInstruction().accept(ev); - //getInstruction().accept(ExecutionVisitor.withFrame(workingFrame)); - outFrames.put(lastExecutionJSR(), workingFrame); - - return true; // new inFrame was different from old inFrame so merging them - // yielded a different this.inFrame. - } - - /** - * Returns a simple String representation of this InstructionContext. - */ - @Override - public String toString() { - //TODO: Put information in the brackets, e.g. - // Is this an ExceptionHandler? Is this a RET? Is this the start of - // a subroutine? - final String ret = getInstruction().toString(false)+"\t[InstructionContext]"; - return ret; - } - - /** - * Does the actual merging (vmspec2, page 146). - * Returns true IFF this.inFrame was changed in course of merging with inFrame. - */ - private boolean mergeInFrames(final Frame inFrame) { - // TODO: Can be performance-improved. - final Frame inF = inFrames.get(lastExecutionJSR()); - final OperandStack oldstack = inF.getStack().getClone(); - final LocalVariables oldlocals = inF.getLocals().getClone(); - try { - inF.getStack().merge(inFrame.getStack()); - inF.getLocals().merge(inFrame.getLocals()); - } catch (final StructuralCodeConstraintException sce) { - extendMessageWithFlow(sce); - throw sce; - } - return !(oldstack.equals(inF.getStack()) && oldlocals.equals(inF.getLocals())); - } - - /** - * Returns the control flow execution chain. This is built - * while execute(Frame, ArrayList)-ing the code represented - * by the surrounding ControlFlowGraph. - */ - private String getExecutionChain() { - String s = this.toString(); - for (int i=executionPredecessors.size()-1; i>=0; i--) { - s = executionPredecessors.get(i)+"\n" + s; - } - return s; - } - - - /** - * Extends the StructuralCodeConstraintException ("e") object with an at-the-end-extended message. - * This extended message will then reflect the execution flow needed to get to the constraint - * violation that triggered the throwing of the "e" object. - */ - private void extendMessageWithFlow(final StructuralCodeConstraintException e) { - final String s = "Execution flow:\n"; - e.extendMessage("", s+getExecutionChain()); - } - - /* - * Fulfils the contract of InstructionContext.getInstruction(). - */ - @Override - public InstructionHandle getInstruction() { - return instruction; - } - - /** - * Returns the InstructionContextImpl with an JSR/JSR_W - * that was last in the ExecutionChain, without - * a corresponding RET, i.e. - * we were called by this one. - * Returns null if we were called from the top level. - */ - private InstructionContextImpl lastExecutionJSR() { - - final int size = executionPredecessors.size(); - int retcount = 0; - - for (int i=size-1; i>=0; i--) { - final InstructionContextImpl current = (InstructionContextImpl) (executionPredecessors.get(i)); - final Instruction currentlast = current.getInstruction().getInstruction(); - if (currentlast instanceof RET) { - retcount++; - } - if (currentlast instanceof JsrInstruction) { - retcount--; - if (retcount == -1) { - return current; - } - } - } - return null; - } - - /* Satisfies InstructionContext.getSuccessors(). */ - @Override - public InstructionContext[] getSuccessors() { - return contextsOf(_getSuccessors()); - } - - /** - * A utility method that calculates the successors of a given InstructionHandle - * That means, a RET does have successors as defined here. - * A JsrInstruction has its target as its successor - * (opposed to its physical successor) as defined here. - */ -// TODO: implement caching! - private InstructionHandle[] _getSuccessors() { - final InstructionHandle[] empty = new InstructionHandle[0]; - final InstructionHandle[] single = new InstructionHandle[1]; - - final Instruction inst = getInstruction().getInstruction(); - - if (inst instanceof RET) { - final Subroutine s = subroutines.subroutineOf(getInstruction()); - if (s==null) { //return empty; - // RET in dead code. "empty" would be the correct answer, but we know something about the surrounding project... - throw new AssertionViolatedException("Asking for successors of a RET in dead code?!"); - } - -//TODO: remove. Only JustIce must not use it, but foreign users of the ControlFlowGraph -// will want it. Thanks Johannes Wust. -//throw new AssertionViolatedException("DID YOU REALLY WANT TO ASK FOR RET'S SUCCS?"); - - final InstructionHandle[] jsrs = s.getEnteringJsrInstructions(); - final InstructionHandle[] ret = new InstructionHandle[jsrs.length]; - for (int i=0; i instructionContexts = new HashMap<>(); - - /** - * A Control Flow Graph; with additional JustIce checks - * @param method_gen the method generator instance - */ - public ControlFlowGraph(final MethodGen method_gen) { - this(method_gen, true); - } - - /** - * A Control Flow Graph. - * @param method_gen the method generator instance - * @param enableJustIceCheck if true, additional JustIce checks are performed - * @since 6.0 - */ - public ControlFlowGraph(final MethodGen method_gen, final boolean enableJustIceCheck) { - subroutines = new Subroutines(method_gen, enableJustIceCheck); - exceptionhandlers = new ExceptionHandlers(method_gen); - - final InstructionHandle[] instructionhandles = method_gen.getInstructionList().getInstructionHandles(); - for (final InstructionHandle instructionhandle : instructionhandles) { - instructionContexts.put(instructionhandle, new InstructionContextImpl(instructionhandle)); - } - - //this.method_gen = method_gen; - } - - /** - * Returns the InstructionContext of a given instruction. - */ - public InstructionContext contextOf(final InstructionHandle inst) { - final InstructionContext ic = instructionContexts.get(inst); - if (ic == null) { - throw new AssertionViolatedException("InstructionContext requested for an InstructionHandle that's not known!"); - } - return ic; - } - - /** - * Returns the InstructionContext[] of a given InstructionHandle[], - * in a naturally ordered manner. - */ - public InstructionContext[] contextsOf(final InstructionHandle[] insts) { - final InstructionContext[] ret = new InstructionContext[insts.length]; - for (int i=0; i(NOT ORDERED!). - */ - public InstructionContext[] getInstructionContexts() { - final InstructionContext[] ret = new InstructionContext[instructionContexts.size()]; - return instructionContexts.values().toArray(ret); - } - - /** - * Returns true, if and only if the said instruction is not reachable; that means, - * if it is not part of this ControlFlowGraph. - */ - public boolean isDead(final InstructionHandle i) { - return subroutines.subroutineOf(i) == null; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/structurals/ExceptionHandler.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/structurals/ExceptionHandler.java deleted file mode 100644 index 73b6080c..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/structurals/ExceptionHandler.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.verifier.structurals; - - -import org.apache.bcel.generic.InstructionHandle; -import org.apache.bcel.generic.ObjectType; - -/** - * This class represents an exception handler; that is, an ObjectType - * representing a subclass of java.lang.Throwable and the instruction - * the handler starts off (represented by an InstructionContext). - * - */ -public class ExceptionHandler{ - /** The type of the exception to catch. NULL means ANY. */ - private final ObjectType catchType; - - /** The InstructionHandle where the handling begins. */ - private final InstructionHandle handlerPc; - - /** Leave instance creation to JustIce. */ - ExceptionHandler(final ObjectType catch_type, final InstructionHandle handler_pc) { - catchType = catch_type; - handlerPc = handler_pc; - } - - /** - * Returns the type of the exception that's handled. 'null' means 'ANY'. - */ - public ObjectType getExceptionType() { - return catchType; - } - - /** - * Returns the InstructionHandle where the handler starts off. - */ - public InstructionHandle getHandlerStart() { - return handlerPc; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/structurals/ExceptionHandlers.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/structurals/ExceptionHandlers.java deleted file mode 100644 index 68529f2b..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/structurals/ExceptionHandlers.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.verifier.structurals; - - -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -import org.apache.bcel.generic.CodeExceptionGen; -import org.apache.bcel.generic.InstructionHandle; -import org.apache.bcel.generic.MethodGen; - -/** - * This class allows easy access to ExceptionHandler objects. - * - */ -public class ExceptionHandlers{ - /** - * The ExceptionHandler instances. - * Key: InstructionHandle objects, Values: HashSet instances. - */ - private final Map> exceptionHandlers; - - /** - * Constructor. Creates a new ExceptionHandlers instance. - */ - public ExceptionHandlers(final MethodGen mg) { - exceptionHandlers = new HashMap<>(); - final CodeExceptionGen[] cegs = mg.getExceptionHandlers(); - for (final CodeExceptionGen ceg : cegs) { - final ExceptionHandler eh = new ExceptionHandler(ceg.getCatchType(), ceg.getHandlerPC()); - for (InstructionHandle ih=ceg.getStartPC(); ih != ceg.getEndPC().getNext(); ih=ih.getNext()) { - Set hs; - hs = exceptionHandlers.get(ih); - if (hs == null) { - hs = new HashSet<>(); - exceptionHandlers.put(ih, hs); - } - hs.add(eh); - } - } - } - - /** - * Returns all the ExceptionHandler instances representing exception - * handlers that protect the instruction ih. - */ - public ExceptionHandler[] getExceptionHandlers(final InstructionHandle ih) { - final Set hsSet = exceptionHandlers.get(ih); - if (hsSet == null) { - return new ExceptionHandler[0]; - } - return hsSet.toArray(new ExceptionHandler[hsSet.size()]); - } - -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/structurals/ExecutionVisitor.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/structurals/ExecutionVisitor.java deleted file mode 100644 index d737ca71..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/structurals/ExecutionVisitor.java +++ /dev/null @@ -1,1273 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.verifier.structurals; - - -import org.apache.bcel.Const; -import org.apache.bcel.classfile.Constant; -import org.apache.bcel.classfile.ConstantClass; -import org.apache.bcel.classfile.ConstantDouble; -import org.apache.bcel.classfile.ConstantFloat; -import org.apache.bcel.classfile.ConstantInteger; -import org.apache.bcel.classfile.ConstantLong; -import org.apache.bcel.classfile.ConstantString; -// CHECKSTYLE:OFF (there are lots of references!) -import org.apache.bcel.generic.*; -//CHECKSTYLE:ON - -/** - * This Visitor class may be used for a type-based Java Virtual Machine - * simulation. - * - *

It does not check for correct types on the OperandStack or in the - * LocalVariables; nor does it check their sizes are sufficiently big. - * Thus, to use this Visitor for bytecode verifying, you have to make sure - * externally that the type constraints of the Java Virtual Machine instructions - * are satisfied. An InstConstraintVisitor may be used for this. - * Anyway, this Visitor does not mandate it. For example, when you - * visitIADD(IADD o), then there are two stack slots popped and one - * stack slot containing a Type.INT is pushed (where you could also - * pop only one slot if you know there are two Type.INT on top of the - * stack). Monitor-specific behavior is not simulated.

- * - * Conventions: - * - *

Type.VOID will never be pushed onto the stack. Type.DOUBLE and Type.LONG - * that would normally take up two stack slots (like Double_HIGH and - * Double_LOW) are represented by a simple single Type.DOUBLE or Type.LONG - * object on the stack here.

- * - *

If a two-slot type is stored into a local variable, the next variable - * is given the type Type.UNKNOWN.

- * - * @see #visitDSTORE(DSTORE o) - * @see InstConstraintVisitor - */ -public class ExecutionVisitor extends EmptyVisitor{ - - /** - * The executionframe we're operating on. - */ - private Frame frame = null; - - /** - * The ConstantPoolGen we're working with. - * @see #setConstantPoolGen(ConstantPoolGen) - */ - private ConstantPoolGen cpg = null; - - /** - * Constructor. Constructs a new instance of this class. - */ - public ExecutionVisitor() {} - - /** - * The OperandStack from the current Frame we're operating on. - * @see #setFrame(Frame) - */ - private OperandStack stack() { - return frame.getStack(); - } - - /** - * The LocalVariables from the current Frame we're operating on. - * @see #setFrame(Frame) - */ - private LocalVariables locals() { - return frame.getLocals(); - } - - /** - * Sets the ConstantPoolGen needed for symbolic execution. - */ - public void setConstantPoolGen(final ConstantPoolGen cpg) { // TODO could be package-protected? - this.cpg = cpg; - } - - /** - * The only method granting access to the single instance of - * the ExecutionVisitor class. Before actively using this - * instance, SET THE ConstantPoolGen FIRST. - * @see #setConstantPoolGen(ConstantPoolGen) - */ - public void setFrame(final Frame f) { // TODO could be package-protected? - this.frame = f; - } - - ///** Symbolically executes the corresponding Java Virtual Machine instruction. */ - //public void visitWIDE(WIDE o) { - // The WIDE instruction is modelled as a flag - // of the embedded instructions in BCEL. - // Therefore BCEL checks for possible errors - // when parsing in the .class file: We don't - // have even the possibilty to care for WIDE - // here. - //} - - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitAALOAD(final AALOAD o) { - stack().pop(); // pop the index int -//System.out.print(stack().peek()); - final Type t = stack().pop(); // Pop Array type - if (t == Type.NULL) { - stack().push(Type.NULL); - } // Do nothing stackwise --- a NullPointerException is thrown at Run-Time - else{ - final ArrayType at = (ArrayType) t; - stack().push(at.getElementType()); - } - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitAASTORE(final AASTORE o) { - stack().pop(); - stack().pop(); - stack().pop(); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitACONST_NULL(final ACONST_NULL o) { - stack().push(Type.NULL); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitALOAD(final ALOAD o) { - stack().push(locals().get(o.getIndex())); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitANEWARRAY(final ANEWARRAY o) { - stack().pop(); //count - stack().push( new ArrayType(o.getType(cpg), 1) ); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitARETURN(final ARETURN o) { - stack().pop(); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitARRAYLENGTH(final ARRAYLENGTH o) { - stack().pop(); - stack().push(Type.INT); - } - - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitASTORE(final ASTORE o) { - locals().set(o.getIndex(), stack().pop()); - //System.err.println("TODO-DEBUG: set LV '"+o.getIndex()+"' to '"+locals().get(o.getIndex())+"'."); - } - - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitATHROW(final ATHROW o) { - final Type t = stack().pop(); - stack().clear(); - if (t.equals(Type.NULL)) { - stack().push(Type.getType("Ljava/lang/NullPointerException;")); - } else { - stack().push(t); - } - } - - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitBALOAD(final BALOAD o) { - stack().pop(); - stack().pop(); - stack().push(Type.INT); - } - - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitBASTORE(final BASTORE o) { - stack().pop(); - stack().pop(); - stack().pop(); - } - - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitBIPUSH(final BIPUSH o) { - stack().push(Type.INT); - } - - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitCALOAD(final CALOAD o) { - stack().pop(); - stack().pop(); - stack().push(Type.INT); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitCASTORE(final CASTORE o) { - stack().pop(); - stack().pop(); - stack().pop(); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitCHECKCAST(final CHECKCAST o) { - // It's possibly wrong to do so, but SUN's - // ByteCode verifier seems to do (only) this, too. - // TODO: One could use a sophisticated analysis here to check - // if a type cannot possibly be cated to another and by - // so doing predict the ClassCastException at run-time. - stack().pop(); - stack().push(o.getType(cpg)); - } - - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitD2F(final D2F o) { - stack().pop(); - stack().push(Type.FLOAT); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitD2I(final D2I o) { - stack().pop(); - stack().push(Type.INT); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitD2L(final D2L o) { - stack().pop(); - stack().push(Type.LONG); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitDADD(final DADD o) { - stack().pop(); - stack().pop(); - stack().push(Type.DOUBLE); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitDALOAD(final DALOAD o) { - stack().pop(); - stack().pop(); - stack().push(Type.DOUBLE); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitDASTORE(final DASTORE o) { - stack().pop(); - stack().pop(); - stack().pop(); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitDCMPG(final DCMPG o) { - stack().pop(); - stack().pop(); - stack().push(Type.INT); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitDCMPL(final DCMPL o) { - stack().pop(); - stack().pop(); - stack().push(Type.INT); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitDCONST(final DCONST o) { - stack().push(Type.DOUBLE); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitDDIV(final DDIV o) { - stack().pop(); - stack().pop(); - stack().push(Type.DOUBLE); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitDLOAD(final DLOAD o) { - stack().push(Type.DOUBLE); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitDMUL(final DMUL o) { - stack().pop(); - stack().pop(); - stack().push(Type.DOUBLE); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitDNEG(final DNEG o) { - stack().pop(); - stack().push(Type.DOUBLE); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitDREM(final DREM o) { - stack().pop(); - stack().pop(); - stack().push(Type.DOUBLE); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitDRETURN(final DRETURN o) { - stack().pop(); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitDSTORE(final DSTORE o) { - locals().set(o.getIndex(), stack().pop()); - locals().set(o.getIndex()+1, Type.UNKNOWN); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitDSUB(final DSUB o) { - stack().pop(); - stack().pop(); - stack().push(Type.DOUBLE); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitDUP(final DUP o) { - final Type t = stack().pop(); - stack().push(t); - stack().push(t); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitDUP_X1(final DUP_X1 o) { - final Type w1 = stack().pop(); - final Type w2 = stack().pop(); - stack().push(w1); - stack().push(w2); - stack().push(w1); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitDUP_X2(final DUP_X2 o) { - final Type w1 = stack().pop(); - final Type w2 = stack().pop(); - if (w2.getSize() == 2) { - stack().push(w1); - stack().push(w2); - stack().push(w1); - } - else{ - final Type w3 = stack().pop(); - stack().push(w1); - stack().push(w3); - stack().push(w2); - stack().push(w1); - } - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitDUP2(final DUP2 o) { - final Type t = stack().pop(); - if (t.getSize() == 2) { - stack().push(t); - stack().push(t); - } - else{ // t.getSize() is 1 - final Type u = stack().pop(); - stack().push(u); - stack().push(t); - stack().push(u); - stack().push(t); - } - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitDUP2_X1(final DUP2_X1 o) { - final Type t = stack().pop(); - if (t.getSize() == 2) { - final Type u = stack().pop(); - stack().push(t); - stack().push(u); - stack().push(t); - } - else{ //t.getSize() is1 - final Type u = stack().pop(); - final Type v = stack().pop(); - stack().push(u); - stack().push(t); - stack().push(v); - stack().push(u); - stack().push(t); - } - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitDUP2_X2(final DUP2_X2 o) { - final Type t = stack().pop(); - if (t.getSize() == 2) { - final Type u = stack().pop(); - if (u.getSize() == 2) { - stack().push(t); - stack().push(u); - stack().push(t); - }else{ - final Type v = stack().pop(); - stack().push(t); - stack().push(v); - stack().push(u); - stack().push(t); - } - } - else{ //t.getSize() is 1 - final Type u = stack().pop(); - final Type v = stack().pop(); - if (v.getSize() == 2) { - stack().push(u); - stack().push(t); - stack().push(v); - stack().push(u); - stack().push(t); - }else{ - final Type w = stack().pop(); - stack().push(u); - stack().push(t); - stack().push(w); - stack().push(v); - stack().push(u); - stack().push(t); - } - } - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitF2D(final F2D o) { - stack().pop(); - stack().push(Type.DOUBLE); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitF2I(final F2I o) { - stack().pop(); - stack().push(Type.INT); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitF2L(final F2L o) { - stack().pop(); - stack().push(Type.LONG); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitFADD(final FADD o) { - stack().pop(); - stack().pop(); - stack().push(Type.FLOAT); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitFALOAD(final FALOAD o) { - stack().pop(); - stack().pop(); - stack().push(Type.FLOAT); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitFASTORE(final FASTORE o) { - stack().pop(); - stack().pop(); - stack().pop(); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitFCMPG(final FCMPG o) { - stack().pop(); - stack().pop(); - stack().push(Type.INT); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitFCMPL(final FCMPL o) { - stack().pop(); - stack().pop(); - stack().push(Type.INT); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitFCONST(final FCONST o) { - stack().push(Type.FLOAT); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitFDIV(final FDIV o) { - stack().pop(); - stack().pop(); - stack().push(Type.FLOAT); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitFLOAD(final FLOAD o) { - stack().push(Type.FLOAT); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitFMUL(final FMUL o) { - stack().pop(); - stack().pop(); - stack().push(Type.FLOAT); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitFNEG(final FNEG o) { - stack().pop(); - stack().push(Type.FLOAT); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitFREM(final FREM o) { - stack().pop(); - stack().pop(); - stack().push(Type.FLOAT); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitFRETURN(final FRETURN o) { - stack().pop(); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitFSTORE(final FSTORE o) { - locals().set(o.getIndex(), stack().pop()); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitFSUB(final FSUB o) { - stack().pop(); - stack().pop(); - stack().push(Type.FLOAT); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitGETFIELD(final GETFIELD o) { - stack().pop(); - Type t = o.getFieldType(cpg); - if ( t.equals(Type.BOOLEAN) || - t.equals(Type.CHAR) || - t.equals(Type.BYTE) || - t.equals(Type.SHORT) ) { - t = Type.INT; - } - stack().push(t); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitGETSTATIC(final GETSTATIC o) { - Type t = o.getFieldType(cpg); - if ( t.equals(Type.BOOLEAN) || - t.equals(Type.CHAR) || - t.equals(Type.BYTE) || - t.equals(Type.SHORT) ) { - t = Type.INT; - } - stack().push(t); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitGOTO(final GOTO o) { - // no stack changes. - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitGOTO_W(final GOTO_W o) { - // no stack changes. - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitI2B(final I2B o) { - stack().pop(); - stack().push(Type.INT); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitI2C(final I2C o) { - stack().pop(); - stack().push(Type.INT); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitI2D(final I2D o) { - stack().pop(); - stack().push(Type.DOUBLE); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitI2F(final I2F o) { - stack().pop(); - stack().push(Type.FLOAT); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitI2L(final I2L o) { - stack().pop(); - stack().push(Type.LONG); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitI2S(final I2S o) { - stack().pop(); - stack().push(Type.INT); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitIADD(final IADD o) { - stack().pop(); - stack().pop(); - stack().push(Type.INT); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitIALOAD(final IALOAD o) { - stack().pop(); - stack().pop(); - stack().push(Type.INT); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitIAND(final IAND o) { - stack().pop(); - stack().pop(); - stack().push(Type.INT); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitIASTORE(final IASTORE o) { - stack().pop(); - stack().pop(); - stack().pop(); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitICONST(final ICONST o) { - stack().push(Type.INT); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitIDIV(final IDIV o) { - stack().pop(); - stack().pop(); - stack().push(Type.INT); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitIF_ACMPEQ(final IF_ACMPEQ o) { - stack().pop(); - stack().pop(); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitIF_ACMPNE(final IF_ACMPNE o) { - stack().pop(); - stack().pop(); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitIF_ICMPEQ(final IF_ICMPEQ o) { - stack().pop(); - stack().pop(); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitIF_ICMPGE(final IF_ICMPGE o) { - stack().pop(); - stack().pop(); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitIF_ICMPGT(final IF_ICMPGT o) { - stack().pop(); - stack().pop(); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitIF_ICMPLE(final IF_ICMPLE o) { - stack().pop(); - stack().pop(); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitIF_ICMPLT(final IF_ICMPLT o) { - stack().pop(); - stack().pop(); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitIF_ICMPNE(final IF_ICMPNE o) { - stack().pop(); - stack().pop(); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitIFEQ(final IFEQ o) { - stack().pop(); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitIFGE(final IFGE o) { - stack().pop(); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitIFGT(final IFGT o) { - stack().pop(); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitIFLE(final IFLE o) { - stack().pop(); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitIFLT(final IFLT o) { - stack().pop(); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitIFNE(final IFNE o) { - stack().pop(); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitIFNONNULL(final IFNONNULL o) { - stack().pop(); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitIFNULL(final IFNULL o) { - stack().pop(); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitIINC(final IINC o) { - // stack is not changed. - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitILOAD(final ILOAD o) { - stack().push(Type.INT); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitIMUL(final IMUL o) { - stack().pop(); - stack().pop(); - stack().push(Type.INT); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitINEG(final INEG o) { - stack().pop(); - stack().push(Type.INT); - } - /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - @Override - public void visitINSTANCEOF(final INSTANCEOF o) { - stack().pop(); - stack().push(Type.INT); - } - /** - * Symbolically executes the corresponding Java Virtual Machine instruction. - * @since 6.0 - */ - @Override - public void visitINVOKEDYNAMIC(final INVOKEDYNAMIC o) { - for (int i=0; i stack().slotsUsed()) { - constraintViolated(o, - "Cannot consume "+consume+" stack slots: only "+stack().slotsUsed()+" slot(s) left on stack!\nStack:\n"+stack()); - } - - final int produce = o.produceStack(cpg) - o.consumeStack(cpg); // Stack values are always consumed first; then produced. - if ( produce + stack().slotsUsed() > stack().maxStack() ) { - constraintViolated(o, "Cannot produce "+produce+" stack slots: only "+(stack().maxStack()-stack().slotsUsed())+ - " free stack slot(s) left.\nStack:\n"+stack()); - } - } - - /***************************************************************/ - /* "generic"visitXXXX methods where XXXX is an interface */ - /* therefore, we don't know the order of visiting; but we know */ - /* these methods are called before the visitYYYY methods below */ - /***************************************************************/ - - /** - * Assures the generic preconditions of a LoadClass instance. - * The referenced class is loaded and pass2-verified. - */ - @Override - public void visitLoadClass(final LoadClass o) { - final ObjectType t = o.getLoadClassType(cpg); - if (t != null) {// null means "no class is loaded" - final Verifier v = VerifierFactory.getVerifier(t.getClassName()); - final VerificationResult vr = v.doPass2(); - if (vr.getStatus() != VerificationResult.VERIFIED_OK) { - constraintViolated((Instruction) o, "Class '"+o.getLoadClassType(cpg).getClassName()+ - "' is referenced, but cannot be loaded and resolved: '"+vr+"'."); - } - } - } - - /** - * Ensures the general preconditions of a StackConsumer instance. - */ - @Override - public void visitStackConsumer(final StackConsumer o) { - _visitStackAccessor((Instruction) o); - } - - /** - * Ensures the general preconditions of a StackProducer instance. - */ - @Override - public void visitStackProducer(final StackProducer o) { - _visitStackAccessor((Instruction) o); - } - - - /***************************************************************/ - /* "generic" visitYYYY methods where YYYY is a superclass. */ - /* therefore, we know the order of visiting; we know */ - /* these methods are called after the visitXXXX methods above. */ - /***************************************************************/ - /** - * Ensures the general preconditions of a CPInstruction instance. - */ - @Override - public void visitCPInstruction(final CPInstruction o) { - final int idx = o.getIndex(); - if ((idx < 0) || (idx >= cpg.getSize())) { - throw new AssertionViolatedException( - "Huh?! Constant pool index of instruction '"+o+"' illegal? Pass 3a should have checked this!"); - } - } - - /** - * Ensures the general preconditions of a FieldInstruction instance. - */ - @Override - public void visitFieldInstruction(final FieldInstruction o) { - // visitLoadClass(o) has been called before: Every FieldOrMethod - // implements LoadClass. - // visitCPInstruction(o) has been called before. - // A FieldInstruction may be: GETFIELD, GETSTATIC, PUTFIELD, PUTSTATIC - final Constant c = cpg.getConstant(o.getIndex()); - if (!(c instanceof ConstantFieldref)) { - constraintViolated(o, - "Index '"+o.getIndex()+"' should refer to a CONSTANT_Fieldref_info structure, but refers to '"+c+"'."); - } - // the o.getClassType(cpg) type has passed pass 2; see visitLoadClass(o). - final Type t = o.getType(cpg); - if (t instanceof ObjectType) { - final String name = ((ObjectType)t).getClassName(); - final Verifier v = VerifierFactory.getVerifier( name ); - final VerificationResult vr = v.doPass2(); - if (vr.getStatus() != VerificationResult.VERIFIED_OK) { - constraintViolated(o, "Class '"+name+"' is referenced, but cannot be loaded and resolved: '"+vr+"'."); - } - } - } - - /** - * Ensures the general preconditions of an InvokeInstruction instance. - */ - @Override - public void visitInvokeInstruction(final InvokeInstruction o) { - // visitLoadClass(o) has been called before: Every FieldOrMethod - // implements LoadClass. - // visitCPInstruction(o) has been called before. - //TODO - } - - /** - * Ensures the general preconditions of a StackInstruction instance. - */ - @Override - public void visitStackInstruction(final StackInstruction o) { - _visitStackAccessor(o); - } - - /** - * Assures the generic preconditions of a LocalVariableInstruction instance. - * That is, the index of the local variable must be valid. - */ - @Override - public void visitLocalVariableInstruction(final LocalVariableInstruction o) { - if (locals().maxLocals() <= (o.getType(cpg).getSize()==1? o.getIndex() : o.getIndex()+1) ) { - constraintViolated(o, "The 'index' is not a valid index into the local variable array."); - } - } - - /** - * Assures the generic preconditions of a LoadInstruction instance. - */ - @Override - public void visitLoadInstruction(final LoadInstruction o) { - //visitLocalVariableInstruction(o) is called before, because it is more generic. - - // LOAD instructions must not read Type.UNKNOWN - if (locals().get(o.getIndex()) == Type.UNKNOWN) { - constraintViolated(o, "Read-Access on local variable "+o.getIndex()+" with unknown content."); - } - - // LOAD instructions, two-slot-values at index N must have Type.UNKNOWN - // as a symbol for the higher halve at index N+1 - // [suppose some instruction put an int at N+1--- our double at N is defective] - if (o.getType(cpg).getSize() == 2) { - if (locals().get(o.getIndex()+1) != Type.UNKNOWN) { - constraintViolated(o, - "Reading a two-locals value from local variables "+o.getIndex()+ - " and "+(o.getIndex()+1)+" where the latter one is destroyed."); - } - } - - // LOAD instructions must read the correct type. - if (!(o instanceof ALOAD)) { - if (locals().get(o.getIndex()) != o.getType(cpg) ) { - constraintViolated(o,"Local Variable type and LOADing Instruction type mismatch: Local Variable: '"+ - locals().get(o.getIndex())+"'; Instruction type: '"+o.getType(cpg)+"'."); - } - } - else{ // we deal with an ALOAD - if (!(locals().get(o.getIndex()) instanceof ReferenceType)) { - constraintViolated(o, "Local Variable type and LOADing Instruction type mismatch: Local Variable: '"+ - locals().get(o.getIndex())+"'; Instruction expects a ReferenceType."); - } - // ALOAD __IS ALLOWED__ to put uninitialized objects onto the stack! - //referenceTypeIsInitialized(o, (ReferenceType) (locals().get(o.getIndex()))); - } - - // LOAD instructions must have enough free stack slots. - if ((stack().maxStack() - stack().slotsUsed()) < o.getType(cpg).getSize()) { - constraintViolated(o, "Not enough free stack slots to load a '"+o.getType(cpg)+"' onto the OperandStack."); - } - } - - /** - * Assures the generic preconditions of a StoreInstruction instance. - */ - @Override - public void visitStoreInstruction(final StoreInstruction o) { - //visitLocalVariableInstruction(o) is called before, because it is more generic. - - if (stack().isEmpty()) { // Don't bother about 1 or 2 stack slots used. This check is implicitly done below while type checking. - constraintViolated(o, "Cannot STORE: Stack to read from is empty."); - } - - if ( !(o instanceof ASTORE) ) { - if (! (stack().peek() == o.getType(cpg)) ) {// the other xSTORE types are singletons in BCEL. - constraintViolated(o, "Stack top type and STOREing Instruction type mismatch: Stack top: '"+stack().peek()+ - "'; Instruction type: '"+o.getType(cpg)+"'."); - } - } - else{ // we deal with ASTORE - final Type stacktop = stack().peek(); - if ( (!(stacktop instanceof ReferenceType)) && (!(stacktop instanceof ReturnaddressType)) ) { - constraintViolated(o, "Stack top type and STOREing Instruction type mismatch: Stack top: '"+stack().peek()+ - "'; Instruction expects a ReferenceType or a ReturnadressType."); - } - //if (stacktop instanceof ReferenceType) { - // referenceTypeIsInitialized(o, (ReferenceType) stacktop); - //} - } - } - - /** - * Assures the generic preconditions of a ReturnInstruction instance. - */ - @Override - public void visitReturnInstruction(final ReturnInstruction o) { - Type method_type = mg.getType(); - if (method_type == Type.BOOLEAN || - method_type == Type.BYTE || - method_type == Type.SHORT || - method_type == Type.CHAR) { - method_type = Type.INT; - } - - if (o instanceof RETURN) { - if (method_type != Type.VOID) { - constraintViolated(o, "RETURN instruction in non-void method."); - } - else{ - return; - } - } - if (o instanceof ARETURN) { - if (method_type == Type.VOID) { - constraintViolated(o, "ARETURN instruction in void method."); - } - if (stack().peek() == Type.NULL) { - return; - } - if (! (stack().peek() instanceof ReferenceType)) { - constraintViolated(o, "Reference type expected on top of stack, but is: '"+stack().peek()+"'."); - } - referenceTypeIsInitialized(o, (ReferenceType) (stack().peek())); - //ReferenceType objectref = (ReferenceType) (stack().peek()); - // TODO: This can only be checked if using Staerk-et-al's "set of object types" instead of a - // "wider cast object type" created during verification. - //if (! (objectref.isAssignmentCompatibleWith(mg.getType())) ) { - // constraintViolated(o, "Type on stack top which should be returned is a '"+stack().peek()+ - // "' which is not assignment compatible with the return type of this method, '"+mg.getType()+"'."); - //} - } - else{ - if (! ( method_type.equals( stack().peek() ))) { - constraintViolated(o, "Current method has return type of '"+mg.getType()+"' expecting a '"+method_type+ - "' on top of the stack. But stack top is a '"+stack().peek()+"'."); - } - } - } - - /***************************************************************/ - /* "special"visitXXXX methods for one type of instruction each */ - /***************************************************************/ - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitAALOAD(final AALOAD o) { - final Type arrayref = stack().peek(1); - final Type index = stack().peek(0); - - indexOfInt(o, index); - if (arrayrefOfArrayType(o, arrayref)) { - if (! (((ArrayType) arrayref).getElementType() instanceof ReferenceType)) { - constraintViolated(o, - "The 'arrayref' does not refer to an array with elements of a ReferenceType but to an array of "+ - ((ArrayType) arrayref).getElementType()+"."); - } - //referenceTypeIsInitialized(o, (ReferenceType) (((ArrayType) arrayref).getElementType())); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitAASTORE(final AASTORE o) { - final Type arrayref = stack().peek(2); - final Type index = stack().peek(1); - final Type value = stack().peek(0); - - indexOfInt(o, index); - if (!(value instanceof ReferenceType)) { - constraintViolated(o, "The 'value' is not of a ReferenceType but of type "+value+"."); - }else{ - //referenceTypeIsInitialized(o, (ReferenceType) value); - } - // Don't bother further with "referenceTypeIsInitialized()", there are no arrays - // of an uninitialized object type. - if (arrayrefOfArrayType(o, arrayref)) { - if (! (((ArrayType) arrayref).getElementType() instanceof ReferenceType)) { - constraintViolated(o, "The 'arrayref' does not refer to an array with elements of a ReferenceType but to an array of "+ - ((ArrayType) arrayref).getElementType()+"."); - } - // No check for array element assignment compatibility. This is done at runtime. - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitACONST_NULL(final ACONST_NULL o) { - // Nothing needs to be done here. - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitALOAD(final ALOAD o) { - //visitLoadInstruction(LoadInstruction) is called before. - - // Nothing else needs to be done here. - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitANEWARRAY(final ANEWARRAY o) { - if (!stack().peek().equals(Type.INT)) { - constraintViolated(o, "The 'count' at the stack top is not of type '"+Type.INT+"' but of type '"+stack().peek()+"'."); - // The runtime constant pool item at that index must be a symbolic reference to a class, - // array, or interface type. See Pass 3a. - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitARETURN(final ARETURN o) { - if (! (stack().peek() instanceof ReferenceType) ) { - constraintViolated(o, "The 'objectref' at the stack top is not of a ReferenceType but of type '"+stack().peek()+"'."); - } - final ReferenceType objectref = (ReferenceType) (stack().peek()); - referenceTypeIsInitialized(o, objectref); - - // The check below should already done via visitReturnInstruction(ReturnInstruction), see there. - // It cannot be done using Staerk-et-al's "set of object types" instead of a - // "wider cast object type", anyway. - //if (! objectref.isAssignmentCompatibleWith(mg.getReturnType() )) { - // constraintViolated(o, "The 'objectref' type "+objectref+ - // " at the stack top is not assignment compatible with the return type '"+mg.getReturnType()+"' of the method."); - //} - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitARRAYLENGTH(final ARRAYLENGTH o) { - final Type arrayref = stack().peek(0); - arrayrefOfArrayType(o, arrayref); - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitASTORE(final ASTORE o) { - if (! ( (stack().peek() instanceof ReferenceType) || (stack().peek() instanceof ReturnaddressType) ) ) { - constraintViolated(o, "The 'objectref' is not of a ReferenceType or of ReturnaddressType but of "+stack().peek()+"."); - } - //if (stack().peek() instanceof ReferenceType) { - // referenceTypeIsInitialized(o, (ReferenceType) (stack().peek()) ); - //} - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitATHROW(final ATHROW o) { - try { - // It's stated that 'objectref' must be of a ReferenceType --- but since Throwable is - // not derived from an ArrayType, it follows that 'objectref' must be of an ObjectType or Type.NULL. - if (! ((stack().peek() instanceof ObjectType) || (stack().peek().equals(Type.NULL))) ) { - constraintViolated(o, "The 'objectref' is not of an (initialized) ObjectType but of type "+stack().peek()+"."); - } - - // NULL is a subclass of every class, so to speak. - if (stack().peek().equals(Type.NULL)) { - return; - } - - final ObjectType exc = (ObjectType) (stack().peek()); - final ObjectType throwable = (ObjectType) (Type.getType("Ljava/lang/Throwable;")); - if ( (! (exc.subclassOf(throwable)) ) && (! (exc.equals(throwable))) ) { - constraintViolated(o, - "The 'objectref' is not of class Throwable or of a subclass of Throwable, but of '"+stack().peek()+"'."); - } - } catch (final ClassNotFoundException e) { - // FIXME: maybe not the best way to handle this - throw new AssertionViolatedException("Missing class: " + e, e); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitBALOAD(final BALOAD o) { - final Type arrayref = stack().peek(1); - final Type index = stack().peek(0); - indexOfInt(o, index); - if (arrayrefOfArrayType(o, arrayref)) { - if (! ( (((ArrayType) arrayref).getElementType().equals(Type.BOOLEAN)) || - (((ArrayType) arrayref).getElementType().equals(Type.BYTE)) ) ) { - constraintViolated(o, - "The 'arrayref' does not refer to an array with elements of a Type.BYTE or Type.BOOLEAN but to an array of '"+ - ((ArrayType) arrayref).getElementType()+"'."); - } - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitBASTORE(final BASTORE o) { - final Type arrayref = stack().peek(2); - final Type index = stack().peek(1); - final Type value = stack().peek(0); - - indexOfInt(o, index); - valueOfInt(o, value); - if (arrayrefOfArrayType(o, arrayref)) { - if (! ( (((ArrayType) arrayref).getElementType().equals(Type.BOOLEAN)) || - (((ArrayType) arrayref).getElementType().equals(Type.BYTE)) ) ) { - constraintViolated(o, - "The 'arrayref' does not refer to an array with elements of a Type.BYTE or Type.BOOLEAN but to an array of '"+ - ((ArrayType) arrayref).getElementType()+"'."); - } - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitBIPUSH(final BIPUSH o) { - // Nothing to do... - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitBREAKPOINT(final BREAKPOINT o) { - throw new AssertionViolatedException( - "In this JustIce verification pass there should not occur an illegal instruction such as BREAKPOINT."); - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitCALOAD(final CALOAD o) { - final Type arrayref = stack().peek(1); - final Type index = stack().peek(0); - - indexOfInt(o, index); - arrayrefOfArrayType(o, arrayref); - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitCASTORE(final CASTORE o) { - final Type arrayref = stack().peek(2); - final Type index = stack().peek(1); - final Type value = stack().peek(0); - - indexOfInt(o, index); - valueOfInt(o, value); - if (arrayrefOfArrayType(o, arrayref)) { - if (! ((ArrayType) arrayref).getElementType().equals(Type.CHAR) ) { - constraintViolated(o, "The 'arrayref' does not refer to an array with elements of type char but to an array of type "+ - ((ArrayType) arrayref).getElementType()+"."); - } - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitCHECKCAST(final CHECKCAST o) { - // The objectref must be of type reference. - final Type objectref = stack().peek(0); - if (!(objectref instanceof ReferenceType)) { - constraintViolated(o, "The 'objectref' is not of a ReferenceType but of type "+objectref+"."); - } - //else{ - // referenceTypeIsInitialized(o, (ReferenceType) objectref); - //} - // The unsigned indexbyte1 and indexbyte2 are used to construct an index into the runtime constant pool of the - // current class (�3.6), where the value of the index is (indexbyte1 << 8) | indexbyte2. The runtime constant - // pool item at the index must be a symbolic reference to a class, array, or interface type. - final Constant c = cpg.getConstant(o.getIndex()); - if (! (c instanceof ConstantClass)) { - constraintViolated(o, "The Constant at 'index' is not a ConstantClass, but '"+c+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitD2F(final D2F o) { - if (stack().peek() != Type.DOUBLE) { - constraintViolated(o, "The value at the stack top is not of type 'double', but of type '"+stack().peek()+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitD2I(final D2I o) { - if (stack().peek() != Type.DOUBLE) { - constraintViolated(o, "The value at the stack top is not of type 'double', but of type '"+stack().peek()+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitD2L(final D2L o) { - if (stack().peek() != Type.DOUBLE) { - constraintViolated(o, "The value at the stack top is not of type 'double', but of type '"+stack().peek()+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitDADD(final DADD o) { - if (stack().peek() != Type.DOUBLE) { - constraintViolated(o, "The value at the stack top is not of type 'double', but of type '"+stack().peek()+"'."); - } - if (stack().peek(1) != Type.DOUBLE) { - constraintViolated(o, "The value at the stack next-to-top is not of type 'double', but of type '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitDALOAD(final DALOAD o) { - indexOfInt(o, stack().peek()); - if (stack().peek(1) == Type.NULL) { - return; - } - if (! (stack().peek(1) instanceof ArrayType)) { - constraintViolated(o, "Stack next-to-top must be of type double[] but is '"+stack().peek(1)+"'."); - } - final Type t = ((ArrayType) (stack().peek(1))).getBasicType(); - if (t != Type.DOUBLE) { - constraintViolated(o, "Stack next-to-top must be of type double[] but is '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitDASTORE(final DASTORE o) { - if (stack().peek() != Type.DOUBLE) { - constraintViolated(o, "The value at the stack top is not of type 'double', but of type '"+stack().peek()+"'."); - } - indexOfInt(o, stack().peek(1)); - if (stack().peek(2) == Type.NULL) { - return; - } - if (! (stack().peek(2) instanceof ArrayType)) { - constraintViolated(o, "Stack next-to-next-to-top must be of type double[] but is '"+stack().peek(2)+"'."); - } - final Type t = ((ArrayType) (stack().peek(2))).getBasicType(); - if (t != Type.DOUBLE) { - constraintViolated(o, "Stack next-to-next-to-top must be of type double[] but is '"+stack().peek(2)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitDCMPG(final DCMPG o) { - if (stack().peek() != Type.DOUBLE) { - constraintViolated(o, "The value at the stack top is not of type 'double', but of type '"+stack().peek()+"'."); - } - if (stack().peek(1) != Type.DOUBLE) { - constraintViolated(o, "The value at the stack next-to-top is not of type 'double', but of type '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitDCMPL(final DCMPL o) { - if (stack().peek() != Type.DOUBLE) { - constraintViolated(o, "The value at the stack top is not of type 'double', but of type '"+stack().peek()+"'."); - } - if (stack().peek(1) != Type.DOUBLE) { - constraintViolated(o, "The value at the stack next-to-top is not of type 'double', but of type '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitDCONST(final DCONST o) { - // There's nothing to be done here. - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitDDIV(final DDIV o) { - if (stack().peek() != Type.DOUBLE) { - constraintViolated(o, "The value at the stack top is not of type 'double', but of type '"+stack().peek()+"'."); - } - if (stack().peek(1) != Type.DOUBLE) { - constraintViolated(o, "The value at the stack next-to-top is not of type 'double', but of type '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitDLOAD(final DLOAD o) { - //visitLoadInstruction(LoadInstruction) is called before. - - // Nothing else needs to be done here. - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitDMUL(final DMUL o) { - if (stack().peek() != Type.DOUBLE) { - constraintViolated(o, "The value at the stack top is not of type 'double', but of type '"+stack().peek()+"'."); - } - if (stack().peek(1) != Type.DOUBLE) { - constraintViolated(o, "The value at the stack next-to-top is not of type 'double', but of type '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitDNEG(final DNEG o) { - if (stack().peek() != Type.DOUBLE) { - constraintViolated(o, "The value at the stack top is not of type 'double', but of type '"+stack().peek()+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitDREM(final DREM o) { - if (stack().peek() != Type.DOUBLE) { - constraintViolated(o, "The value at the stack top is not of type 'double', but of type '"+stack().peek()+"'."); - } - if (stack().peek(1) != Type.DOUBLE) { - constraintViolated(o, "The value at the stack next-to-top is not of type 'double', but of type '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitDRETURN(final DRETURN o) { - if (stack().peek() != Type.DOUBLE) { - constraintViolated(o, "The value at the stack top is not of type 'double', but of type '"+stack().peek()+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitDSTORE(final DSTORE o) { - //visitStoreInstruction(StoreInstruction) is called before. - - // Nothing else needs to be done here. - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitDSUB(final DSUB o) { - if (stack().peek() != Type.DOUBLE) { - constraintViolated(o, "The value at the stack top is not of type 'double', but of type '"+stack().peek()+"'."); - } - if (stack().peek(1) != Type.DOUBLE) { - constraintViolated(o, "The value at the stack next-to-top is not of type 'double', but of type '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitDUP(final DUP o) { - if (stack().peek().getSize() != 1) { - constraintViolated(o, "Won't DUP type on stack top '"+stack().peek()+ - "' because it must occupy exactly one slot, not '"+stack().peek().getSize()+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitDUP_X1(final DUP_X1 o) { - if (stack().peek().getSize() != 1) { - constraintViolated(o, - "Type on stack top '"+stack().peek()+"' should occupy exactly one slot, not '"+stack().peek().getSize()+"'."); - } - if (stack().peek(1).getSize() != 1) { - constraintViolated(o, - "Type on stack next-to-top '"+stack().peek(1)+ - "' should occupy exactly one slot, not '"+stack().peek(1).getSize()+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitDUP_X2(final DUP_X2 o) { - if (stack().peek().getSize() != 1) { - constraintViolated(o, - "Stack top type must be of size 1, but is '"+stack().peek()+"' of size '"+stack().peek().getSize()+"'."); - } - if (stack().peek(1).getSize() == 2) { - return; // Form 2, okay. - } - //stack().peek(1).getSize == 1. - if (stack().peek(2).getSize() != 1) { - constraintViolated(o, - "If stack top's size is 1 and stack next-to-top's size is 1,"+ - " stack next-to-next-to-top's size must also be 1, but is: '"+ - stack().peek(2)+"' of size '"+stack().peek(2).getSize()+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitDUP2(final DUP2 o) { - if (stack().peek().getSize() == 2) { - return; // Form 2, okay. - } - //stack().peek().getSize() == 1. - if (stack().peek(1).getSize() != 1) { - constraintViolated(o, - "If stack top's size is 1, then stack next-to-top's size must also be 1. But it is '"+stack().peek(1)+ - "' of size '"+stack().peek(1).getSize()+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitDUP2_X1(final DUP2_X1 o) { - if (stack().peek().getSize() == 2) { - if (stack().peek(1).getSize() != 1) { - constraintViolated(o, "If stack top's size is 2, then stack next-to-top's size must be 1. But it is '"+ - stack().peek(1)+"' of size '"+stack().peek(1).getSize()+"'."); - } - else{ - return; // Form 2 - } - } - else{ // stack top is of size 1 - if ( stack().peek(1).getSize() != 1 ) { - constraintViolated(o, "If stack top's size is 1, then stack next-to-top's size must also be 1. But it is '"+ - stack().peek(1)+"' of size '"+stack().peek(1).getSize()+"'."); - } - if ( stack().peek(2).getSize() != 1 ) { - constraintViolated(o, "If stack top's size is 1, then stack next-to-next-to-top's size must also be 1. But it is '"+ - stack().peek(2)+"' of size '"+stack().peek(2).getSize()+"'."); - } - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitDUP2_X2(final DUP2_X2 o) { - - if (stack().peek(0).getSize() == 2) { - if (stack().peek(1).getSize() == 2) { - return; // Form 4 - } - // stack top size is 2, next-to-top's size is 1 - if ( stack().peek(2).getSize() != 1 ) { - constraintViolated(o, "If stack top's size is 2 and stack-next-to-top's size is 1,"+ - " then stack next-to-next-to-top's size must also be 1. But it is '"+stack().peek(2)+ - "' of size '"+stack().peek(2).getSize()+"'."); - } - else{ - return; // Form 2 - } - } - else{// stack top is of size 1 - if (stack().peek(1).getSize() == 1) { - if ( stack().peek(2).getSize() == 2 ) { - return; // Form 3 - } - if ( stack().peek(3).getSize() == 1) { - return; // Form 1 - } - } - } - constraintViolated(o, "The operand sizes on the stack do not match any of the four forms of usage of this instruction."); - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitF2D(final F2D o) { - if (stack().peek() != Type.FLOAT) { - constraintViolated(o, "The value at the stack top is not of type 'float', but of type '"+stack().peek()+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitF2I(final F2I o) { - if (stack().peek() != Type.FLOAT) { - constraintViolated(o, "The value at the stack top is not of type 'float', but of type '"+stack().peek()+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitF2L(final F2L o) { - if (stack().peek() != Type.FLOAT) { - constraintViolated(o, "The value at the stack top is not of type 'float', but of type '"+stack().peek()+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitFADD(final FADD o) { - if (stack().peek() != Type.FLOAT) { - constraintViolated(o, "The value at the stack top is not of type 'float', but of type '"+stack().peek()+"'."); - } - if (stack().peek(1) != Type.FLOAT) { - constraintViolated(o, "The value at the stack next-to-top is not of type 'float', but of type '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitFALOAD(final FALOAD o) { - indexOfInt(o, stack().peek()); - if (stack().peek(1) == Type.NULL) { - return; - } - if (! (stack().peek(1) instanceof ArrayType)) { - constraintViolated(o, "Stack next-to-top must be of type float[] but is '"+stack().peek(1)+"'."); - } - final Type t = ((ArrayType) (stack().peek(1))).getBasicType(); - if (t != Type.FLOAT) { - constraintViolated(o, "Stack next-to-top must be of type float[] but is '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitFASTORE(final FASTORE o) { - if (stack().peek() != Type.FLOAT) { - constraintViolated(o, "The value at the stack top is not of type 'float', but of type '"+stack().peek()+"'."); - } - indexOfInt(o, stack().peek(1)); - if (stack().peek(2) == Type.NULL) { - return; - } - if (! (stack().peek(2) instanceof ArrayType)) { - constraintViolated(o, "Stack next-to-next-to-top must be of type float[] but is '"+stack().peek(2)+"'."); - } - final Type t = ((ArrayType) (stack().peek(2))).getBasicType(); - if (t != Type.FLOAT) { - constraintViolated(o, "Stack next-to-next-to-top must be of type float[] but is '"+stack().peek(2)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitFCMPG(final FCMPG o) { - if (stack().peek() != Type.FLOAT) { - constraintViolated(o, "The value at the stack top is not of type 'float', but of type '"+stack().peek()+"'."); - } - if (stack().peek(1) != Type.FLOAT) { - constraintViolated(o, "The value at the stack next-to-top is not of type 'float', but of type '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitFCMPL(final FCMPL o) { - if (stack().peek() != Type.FLOAT) { - constraintViolated(o, "The value at the stack top is not of type 'float', but of type '"+stack().peek()+"'."); - } - if (stack().peek(1) != Type.FLOAT) { - constraintViolated(o, "The value at the stack next-to-top is not of type 'float', but of type '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitFCONST(final FCONST o) { - // nothing to do here. - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitFDIV(final FDIV o) { - if (stack().peek() != Type.FLOAT) { - constraintViolated(o, "The value at the stack top is not of type 'float', but of type '"+stack().peek()+"'."); - } - if (stack().peek(1) != Type.FLOAT) { - constraintViolated(o, "The value at the stack next-to-top is not of type 'float', but of type '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitFLOAD(final FLOAD o) { - //visitLoadInstruction(LoadInstruction) is called before. - - // Nothing else needs to be done here. - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitFMUL(final FMUL o) { - if (stack().peek() != Type.FLOAT) { - constraintViolated(o, "The value at the stack top is not of type 'float', but of type '"+stack().peek()+"'."); - } - if (stack().peek(1) != Type.FLOAT) { - constraintViolated(o, "The value at the stack next-to-top is not of type 'float', but of type '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitFNEG(final FNEG o) { - if (stack().peek() != Type.FLOAT) { - constraintViolated(o, "The value at the stack top is not of type 'float', but of type '"+stack().peek()+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitFREM(final FREM o) { - if (stack().peek() != Type.FLOAT) { - constraintViolated(o, "The value at the stack top is not of type 'float', but of type '"+stack().peek()+"'."); - } - if (stack().peek(1) != Type.FLOAT) { - constraintViolated(o, "The value at the stack next-to-top is not of type 'float', but of type '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitFRETURN(final FRETURN o) { - if (stack().peek() != Type.FLOAT) { - constraintViolated(o, "The value at the stack top is not of type 'float', but of type '"+stack().peek()+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitFSTORE(final FSTORE o) { - //visitStoreInstruction(StoreInstruction) is called before. - - // Nothing else needs to be done here. - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitFSUB(final FSUB o) { - if (stack().peek() != Type.FLOAT) { - constraintViolated(o, "The value at the stack top is not of type 'float', but of type '"+stack().peek()+"'."); - } - if (stack().peek(1) != Type.FLOAT) { - constraintViolated(o, "The value at the stack next-to-top is not of type 'float', but of type '"+stack().peek(1)+"'."); - } - } - - private ObjectType getObjectType(final FieldInstruction o) { - final ReferenceType rt = o.getReferenceType(cpg); - if(rt instanceof ObjectType) { - return (ObjectType)rt; - } - constraintViolated(o, "expecting ObjectType but got "+rt); - return null; - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitGETFIELD(final GETFIELD o) { - try { - final Type objectref = stack().peek(); - if (! ( (objectref instanceof ObjectType) || (objectref == Type.NULL) ) ) { - constraintViolated(o, "Stack top should be an object reference that's not an array reference, but is '"+objectref+"'."); - } - - final String field_name = o.getFieldName(cpg); - - final JavaClass jc = Repository.lookupClass(getObjectType(o).getClassName()); - Field[] fields = jc.getFields(); - Field f = null; - for (final Field field : fields) { - if (field.getName().equals(field_name)) { - final Type f_type = Type.getType(field.getSignature()); - final Type o_type = o.getType(cpg); - /* TODO: Check if assignment compatibility is sufficient. - * What does Sun do? - */ - if (f_type.equals(o_type)) { - f = field; - break; - } - } - } - - if (f == null) { - final JavaClass[] superclasses = jc.getSuperClasses(); - outer: - for (final JavaClass superclass : superclasses) { - fields = superclass.getFields(); - for (final Field field : fields) { - if (field.getName().equals(field_name)) { - final Type f_type = Type.getType(field.getSignature()); - final Type o_type = o.getType(cpg); - if (f_type.equals(o_type)) { - f = field; - if ((f.getAccessFlags() & (Const.ACC_PUBLIC | Const.ACC_PROTECTED)) == 0) { - f = null; - } - break outer; - } - } - } - } - if (f == null) { - throw new AssertionViolatedException("Field '" + field_name + "' not found in " + jc.getClassName()); - } - } - - if (f.isProtected()) { - final ObjectType classtype = getObjectType(o); - final ObjectType curr = ObjectType.getInstance(mg.getClassName()); - - if ( classtype.equals(curr) || - curr.subclassOf(classtype) ) { - final Type t = stack().peek(); - if (t == Type.NULL) { - return; - } - if (! (t instanceof ObjectType) ) { - constraintViolated(o, "The 'objectref' must refer to an object that's not an array. Found instead: '"+t+"'."); - } - final ObjectType objreftype = (ObjectType) t; - if (! ( objreftype.equals(curr) || - objreftype.subclassOf(curr) ) ) { - //TODO: One day move to Staerk-et-al's "Set of object types" instead of "wider" object types - // created during the verification. - // "Wider" object types don't allow us to check for things like that below. - //constraintViolated(o, "The referenced field has the ACC_PROTECTED modifier, "+ - // "and it's a member of the current class or a superclass of the current class."+ - // " However, the referenced object type '"+stack().peek()+ - // "' is not the current class or a subclass of the current class."); - } - } - } - - // TODO: Could go into Pass 3a. - if (f.isStatic()) { - constraintViolated(o, "Referenced field '"+f+"' is static which it shouldn't be."); - } - - } catch (final ClassNotFoundException e) { - // FIXME: maybe not the best way to handle this - throw new AssertionViolatedException("Missing class: " + e, e); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitGETSTATIC(final GETSTATIC o) { - // Field must be static: see Pass 3a. - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitGOTO(final GOTO o) { - // nothing to do here. - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitGOTO_W(final GOTO_W o) { - // nothing to do here. - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitI2B(final I2B o) { - if (stack().peek() != Type.INT) { - constraintViolated(o, "The value at the stack top is not of type 'int', but of type '"+stack().peek()+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitI2C(final I2C o) { - if (stack().peek() != Type.INT) { - constraintViolated(o, "The value at the stack top is not of type 'int', but of type '"+stack().peek()+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitI2D(final I2D o) { - if (stack().peek() != Type.INT) { - constraintViolated(o, "The value at the stack top is not of type 'int', but of type '"+stack().peek()+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitI2F(final I2F o) { - if (stack().peek() != Type.INT) { - constraintViolated(o, "The value at the stack top is not of type 'int', but of type '"+stack().peek()+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitI2L(final I2L o) { - if (stack().peek() != Type.INT) { - constraintViolated(o, "The value at the stack top is not of type 'int', but of type '"+stack().peek()+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitI2S(final I2S o) { - if (stack().peek() != Type.INT) { - constraintViolated(o, "The value at the stack top is not of type 'int', but of type '"+stack().peek()+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitIADD(final IADD o) { - if (stack().peek() != Type.INT) { - constraintViolated(o, "The value at the stack top is not of type 'int', but of type '"+stack().peek()+"'."); - } - if (stack().peek(1) != Type.INT) { - constraintViolated(o, "The value at the stack next-to-top is not of type 'int', but of type '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitIALOAD(final IALOAD o) { - indexOfInt(o, stack().peek()); - if (stack().peek(1) == Type.NULL) { - return; - } - if (! (stack().peek(1) instanceof ArrayType)) { - constraintViolated(o, "Stack next-to-top must be of type int[] but is '"+stack().peek(1)+"'."); - } - final Type t = ((ArrayType) (stack().peek(1))).getBasicType(); - if (t != Type.INT) { - constraintViolated(o, "Stack next-to-top must be of type int[] but is '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitIAND(final IAND o) { - if (stack().peek() != Type.INT) { - constraintViolated(o, "The value at the stack top is not of type 'int', but of type '"+stack().peek()+"'."); - } - if (stack().peek(1) != Type.INT) { - constraintViolated(o, "The value at the stack next-to-top is not of type 'int', but of type '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitIASTORE(final IASTORE o) { - if (stack().peek() != Type.INT) { - constraintViolated(o, "The value at the stack top is not of type 'int', but of type '"+stack().peek()+"'."); - } - indexOfInt(o, stack().peek(1)); - if (stack().peek(2) == Type.NULL) { - return; - } - if (! (stack().peek(2) instanceof ArrayType)) { - constraintViolated(o, "Stack next-to-next-to-top must be of type int[] but is '"+stack().peek(2)+"'."); - } - final Type t = ((ArrayType) (stack().peek(2))).getBasicType(); - if (t != Type.INT) { - constraintViolated(o, "Stack next-to-next-to-top must be of type int[] but is '"+stack().peek(2)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitICONST(final ICONST o) { - //nothing to do here. - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitIDIV(final IDIV o) { - if (stack().peek() != Type.INT) { - constraintViolated(o, "The value at the stack top is not of type 'int', but of type '"+stack().peek()+"'."); - } - if (stack().peek(1) != Type.INT) { - constraintViolated(o, "The value at the stack next-to-top is not of type 'int', but of type '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitIF_ACMPEQ(final IF_ACMPEQ o) { - if (!(stack().peek() instanceof ReferenceType)) { - constraintViolated(o, "The value at the stack top is not of a ReferenceType, but of type '"+stack().peek()+"'."); - } - //referenceTypeIsInitialized(o, (ReferenceType) (stack().peek()) ); - - if (!(stack().peek(1) instanceof ReferenceType)) { - constraintViolated(o, "The value at the stack next-to-top is not of a ReferenceType, but of type '"+stack().peek(1)+"'."); - } - //referenceTypeIsInitialized(o, (ReferenceType) (stack().peek(1)) ); - - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitIF_ACMPNE(final IF_ACMPNE o) { - if (!(stack().peek() instanceof ReferenceType)) { - constraintViolated(o, "The value at the stack top is not of a ReferenceType, but of type '"+stack().peek()+"'."); - //referenceTypeIsInitialized(o, (ReferenceType) (stack().peek()) ); - } - if (!(stack().peek(1) instanceof ReferenceType)) { - constraintViolated(o, "The value at the stack next-to-top is not of a ReferenceType, but of type '"+stack().peek(1)+"'."); - //referenceTypeIsInitialized(o, (ReferenceType) (stack().peek(1)) ); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitIF_ICMPEQ(final IF_ICMPEQ o) { - if (stack().peek() != Type.INT) { - constraintViolated(o, "The value at the stack top is not of type 'int', but of type '"+stack().peek()+"'."); - } - if (stack().peek(1) != Type.INT) { - constraintViolated(o, "The value at the stack next-to-top is not of type 'int', but of type '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitIF_ICMPGE(final IF_ICMPGE o) { - if (stack().peek() != Type.INT) { - constraintViolated(o, "The value at the stack top is not of type 'int', but of type '"+stack().peek()+"'."); - } - if (stack().peek(1) != Type.INT) { - constraintViolated(o, "The value at the stack next-to-top is not of type 'int', but of type '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitIF_ICMPGT(final IF_ICMPGT o) { - if (stack().peek() != Type.INT) { - constraintViolated(o, "The value at the stack top is not of type 'int', but of type '"+stack().peek()+"'."); - } - if (stack().peek(1) != Type.INT) { - constraintViolated(o, "The value at the stack next-to-top is not of type 'int', but of type '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitIF_ICMPLE(final IF_ICMPLE o) { - if (stack().peek() != Type.INT) { - constraintViolated(o, "The value at the stack top is not of type 'int', but of type '"+stack().peek()+"'."); - } - if (stack().peek(1) != Type.INT) { - constraintViolated(o, "The value at the stack next-to-top is not of type 'int', but of type '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitIF_ICMPLT(final IF_ICMPLT o) { - if (stack().peek() != Type.INT) { - constraintViolated(o, "The value at the stack top is not of type 'int', but of type '"+stack().peek()+"'."); - } - if (stack().peek(1) != Type.INT) { - constraintViolated(o, "The value at the stack next-to-top is not of type 'int', but of type '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitIF_ICMPNE(final IF_ICMPNE o) { - if (stack().peek() != Type.INT) { - constraintViolated(o, "The value at the stack top is not of type 'int', but of type '"+stack().peek()+"'."); - } - if (stack().peek(1) != Type.INT) { - constraintViolated(o, "The value at the stack next-to-top is not of type 'int', but of type '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitIFEQ(final IFEQ o) { - if (stack().peek() != Type.INT) { - constraintViolated(o, "The value at the stack top is not of type 'int', but of type '"+stack().peek()+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitIFGE(final IFGE o) { - if (stack().peek() != Type.INT) { - constraintViolated(o, "The value at the stack top is not of type 'int', but of type '"+stack().peek()+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitIFGT(final IFGT o) { - if (stack().peek() != Type.INT) { - constraintViolated(o, "The value at the stack top is not of type 'int', but of type '"+stack().peek()+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitIFLE(final IFLE o) { - if (stack().peek() != Type.INT) { - constraintViolated(o, "The value at the stack top is not of type 'int', but of type '"+stack().peek()+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitIFLT(final IFLT o) { - if (stack().peek() != Type.INT) { - constraintViolated(o, "The value at the stack top is not of type 'int', but of type '"+stack().peek()+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitIFNE(final IFNE o) { - if (stack().peek() != Type.INT) { - constraintViolated(o, "The value at the stack top is not of type 'int', but of type '"+stack().peek()+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitIFNONNULL(final IFNONNULL o) { - if (!(stack().peek() instanceof ReferenceType)) { - constraintViolated(o, "The value at the stack top is not of a ReferenceType, but of type '"+stack().peek()+"'."); - } - referenceTypeIsInitialized(o, (ReferenceType) (stack().peek()) ); - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitIFNULL(final IFNULL o) { - if (!(stack().peek() instanceof ReferenceType)) { - constraintViolated(o, "The value at the stack top is not of a ReferenceType, but of type '"+stack().peek()+"'."); - } - referenceTypeIsInitialized(o, (ReferenceType) (stack().peek()) ); - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitIINC(final IINC o) { - // Mhhh. In BCEL, at this time "IINC" is not a LocalVariableInstruction. - if (locals().maxLocals() <= (o.getType(cpg).getSize()==1? o.getIndex() : o.getIndex()+1) ) { - constraintViolated(o, "The 'index' is not a valid index into the local variable array."); - } - - indexOfInt(o, locals().get(o.getIndex())); - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitILOAD(final ILOAD o) { - // All done by visitLocalVariableInstruction(), visitLoadInstruction() - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitIMPDEP1(final IMPDEP1 o) { - throw new AssertionViolatedException( - "In this JustIce verification pass there should not occur an illegal instruction such as IMPDEP1."); - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitIMPDEP2(final IMPDEP2 o) { - throw new AssertionViolatedException( - "In this JustIce verification pass there should not occur an illegal instruction such as IMPDEP2."); - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitIMUL(final IMUL o) { - if (stack().peek() != Type.INT) { - constraintViolated(o, "The value at the stack top is not of type 'int', but of type '"+stack().peek()+"'."); - } - if (stack().peek(1) != Type.INT) { - constraintViolated(o, "The value at the stack next-to-top is not of type 'int', but of type '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitINEG(final INEG o) { - if (stack().peek() != Type.INT) { - constraintViolated(o, "The value at the stack top is not of type 'int', but of type '"+stack().peek()+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitINSTANCEOF(final INSTANCEOF o) { - // The objectref must be of type reference. - final Type objectref = stack().peek(0); - if (!(objectref instanceof ReferenceType)) { - constraintViolated(o, "The 'objectref' is not of a ReferenceType but of type "+objectref+"."); - } - //else{ - // referenceTypeIsInitialized(o, (ReferenceType) objectref); - //} - // The unsigned indexbyte1 and indexbyte2 are used to construct an index into the runtime constant pool of the - // current class (�3.6), where the value of the index is (indexbyte1 << 8) | indexbyte2. The runtime constant - // pool item at the index must be a symbolic reference to a class, array, or interface type. - final Constant c = cpg.getConstant(o.getIndex()); - if (! (c instanceof ConstantClass)) { - constraintViolated(o, "The Constant at 'index' is not a ConstantClass, but '"+c+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - * @since 6.0 - */ - @Override - public void visitINVOKEDYNAMIC(final INVOKEDYNAMIC o) { - throw new UnsupportedOperationException("INVOKEDYNAMIC instruction is not supported at this time"); - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitINVOKEINTERFACE(final INVOKEINTERFACE o) { - // Method is not native, otherwise pass 3 would not happen. - - final int count = o.getCount(); - if (count == 0) { - constraintViolated(o, "The 'count' argument must not be 0."); - } - // It is a ConstantInterfaceMethodref, Pass 3a made it sure. - // TODO: Do we want to do anything with it? - //ConstantInterfaceMethodref cimr = (ConstantInterfaceMethodref) (cpg.getConstant(o.getIndex())); - - // the o.getClassType(cpg) type has passed pass 2; see visitLoadClass(o). - - final Type t = o.getType(cpg); - if (t instanceof ObjectType) { - final String name = ((ObjectType)t).getClassName(); - final Verifier v = VerifierFactory.getVerifier( name ); - final VerificationResult vr = v.doPass2(); - if (vr.getStatus() != VerificationResult.VERIFIED_OK) { - constraintViolated(o, "Class '"+name+"' is referenced, but cannot be loaded and resolved: '"+vr+"'."); - } - } - - - final Type[] argtypes = o.getArgumentTypes(cpg); - final int nargs = argtypes.length; - - for (int i=nargs-1; i>=0; i--) { - final Type fromStack = stack().peek( (nargs-1) - i ); // 0 to nargs-1 - Type fromDesc = argtypes[i]; - if (fromDesc == Type.BOOLEAN || - fromDesc == Type.BYTE || - fromDesc == Type.CHAR || - fromDesc == Type.SHORT) { - fromDesc = Type.INT; - } - if (! fromStack.equals(fromDesc)) { - if (fromStack instanceof ReferenceType && fromDesc instanceof ReferenceType) { - final ReferenceType rFromStack = (ReferenceType) fromStack; - //ReferenceType rFromDesc = (ReferenceType) fromDesc; - // TODO: This can only be checked when using Staerk-et-al's "set of object types" - // instead of a "wider cast object type" created during verification. - //if ( ! rFromStack.isAssignmentCompatibleWith(rFromDesc) ) { - // constraintViolated(o, "Expecting a '"+fromDesc+"' but found a '"+fromStack+ - // "' on the stack (which is not assignment compatible)."); - //} - referenceTypeIsInitialized(o, rFromStack); - } - else{ - constraintViolated(o, "Expecting a '"+fromDesc+"' but found a '"+fromStack+"' on the stack."); - } - } - } - - Type objref = stack().peek(nargs); - if (objref == Type.NULL) { - return; - } - if (! (objref instanceof ReferenceType) ) { - constraintViolated(o, "Expecting a reference type as 'objectref' on the stack, not a '"+objref+"'."); - } - referenceTypeIsInitialized(o, (ReferenceType) objref); - if (!(objref instanceof ObjectType)) { - if (!(objref instanceof ArrayType)) { // could be a ReturnaddressType - constraintViolated(o, "Expecting an ObjectType as 'objectref' on the stack, not a '"+objref+"'."); - } - else{ - objref = GENERIC_ARRAY; - } - } - - // String objref_classname = ((ObjectType) objref).getClassName(); - // String theInterface = o.getClassName(cpg); - // TODO: This can only be checked if we're using Staerk-et-al's "set of object types" - // instead of "wider cast object types" generated during verification. - //if ( ! Repository.implementationOf(objref_classname, theInterface) ) { - // constraintViolated(o, "The 'objref' item '"+objref+"' does not implement '"+theInterface+"' as expected."); - //} - - int counted_count = 1; // 1 for the objectref - for (int i=0; i=0; i--) { - final Type fromStack = stack().peek( (nargs-1) - i ); // 0 to nargs-1 - Type fromDesc = argtypes[i]; - if (fromDesc == Type.BOOLEAN || - fromDesc == Type.BYTE || - fromDesc == Type.CHAR || - fromDesc == Type.SHORT) { - fromDesc = Type.INT; - } - if (! fromStack.equals(fromDesc)) { - if (fromStack instanceof ReferenceType && fromDesc instanceof ReferenceType) { - final ReferenceType rFromStack = (ReferenceType) fromStack; - final ReferenceType rFromDesc = (ReferenceType) fromDesc; - // TODO: This can only be checked using Staerk-et-al's "set of object types", not - // using a "wider cast object type". - if ( ! rFromStack.isAssignmentCompatibleWith(rFromDesc) ) { - constraintViolated(o, "Expecting a '"+fromDesc+"' but found a '"+fromStack+ - "' on the stack (which is not assignment compatible)."); - } - referenceTypeIsInitialized(o, rFromStack); - } - else{ - constraintViolated(o, "Expecting a '"+fromDesc+"' but found a '"+fromStack+"' on the stack."); - } - } - } - - Type objref = stack().peek(nargs); - if (objref == Type.NULL) { - return; - } - if (! (objref instanceof ReferenceType) ) { - constraintViolated(o, "Expecting a reference type as 'objectref' on the stack, not a '"+objref+"'."); - } - String objref_classname = null; - if ( !(o.getMethodName(cpg).equals(Const.CONSTRUCTOR_NAME))) { - referenceTypeIsInitialized(o, (ReferenceType) objref); - if (!(objref instanceof ObjectType)) { - if (!(objref instanceof ArrayType)) { // could be a ReturnaddressType - constraintViolated(o, "Expecting an ObjectType as 'objectref' on the stack, not a '"+objref+"'."); - } - else{ - objref = GENERIC_ARRAY; - } - } - - objref_classname = ((ObjectType) objref).getClassName(); - } - else{ - if (!(objref instanceof UninitializedObjectType)) { - constraintViolated(o, "Expecting an UninitializedObjectType as 'objectref' on the stack, not a '"+objref+ - "'. Otherwise, you couldn't invoke a method since an array has no methods (not to speak of a return address)."); - } - objref_classname = ((UninitializedObjectType) objref).getInitialized().getClassName(); - } - - - final String theClass = o.getClassName(cpg); - if ( ! Repository.instanceOf(objref_classname, theClass) ) { - constraintViolated(o, "The 'objref' item '"+objref+"' does not implement '"+theClass+"' as expected."); - } - - } catch (final ClassNotFoundException e) { - // FIXME: maybe not the best way to handle this - throw new AssertionViolatedException("Missing class: " + e, e); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitINVOKESTATIC(final INVOKESTATIC o) { - try { - // Method is not native, otherwise pass 3 would not happen. - - final Type t = o.getType(cpg); - if (t instanceof ObjectType) { - final String name = ((ObjectType)t).getClassName(); - final Verifier v = VerifierFactory.getVerifier( name ); - final VerificationResult vr = v.doPass2(); - if (vr.getStatus() != VerificationResult.VERIFIED_OK) { - constraintViolated(o, "Class '"+name+"' is referenced, but cannot be loaded and resolved: '"+vr+"'."); - } - } - - final Type[] argtypes = o.getArgumentTypes(cpg); - final int nargs = argtypes.length; - - for (int i=nargs-1; i>=0; i--) { - final Type fromStack = stack().peek( (nargs-1) - i ); // 0 to nargs-1 - Type fromDesc = argtypes[i]; - if (fromDesc == Type.BOOLEAN || - fromDesc == Type.BYTE || - fromDesc == Type.CHAR || - fromDesc == Type.SHORT) { - fromDesc = Type.INT; - } - if (! fromStack.equals(fromDesc)) { - if (fromStack instanceof ReferenceType && fromDesc instanceof ReferenceType) { - final ReferenceType rFromStack = (ReferenceType) fromStack; - final ReferenceType rFromDesc = (ReferenceType) fromDesc; - // TODO: This check can possibly only be done using Staerk-et-al's "set of object types" - // instead of a "wider cast object type" created during verification. - if ( ! rFromStack.isAssignmentCompatibleWith(rFromDesc) ) { - constraintViolated(o, "Expecting a '"+fromDesc+"' but found a '"+fromStack+ - "' on the stack (which is not assignment compatible)."); - } - referenceTypeIsInitialized(o, rFromStack); - } - else{ - constraintViolated(o, "Expecting a '"+fromDesc+"' but found a '"+fromStack+"' on the stack."); - } - } - } - } catch (final ClassNotFoundException e) { - // FIXME: maybe not the best way to handle this - throw new AssertionViolatedException("Missing class: " + e, e); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitINVOKEVIRTUAL(final INVOKEVIRTUAL o) { - try { - // the o.getClassType(cpg) type has passed pass 2; see visitLoadClass(o). - - final Type t = o.getType(cpg); - if (t instanceof ObjectType) { - final String name = ((ObjectType)t).getClassName(); - final Verifier v = VerifierFactory.getVerifier( name ); - final VerificationResult vr = v.doPass2(); - if (vr.getStatus() != VerificationResult.VERIFIED_OK) { - constraintViolated(o, "Class '"+name+"' is referenced, but cannot be loaded and resolved: '"+vr+"'."); - } - } - - - final Type[] argtypes = o.getArgumentTypes(cpg); - final int nargs = argtypes.length; - - for (int i=nargs-1; i>=0; i--) { - final Type fromStack = stack().peek( (nargs-1) - i ); // 0 to nargs-1 - Type fromDesc = argtypes[i]; - if (fromDesc == Type.BOOLEAN || - fromDesc == Type.BYTE || - fromDesc == Type.CHAR || - fromDesc == Type.SHORT) { - fromDesc = Type.INT; - } - if (! fromStack.equals(fromDesc)) { - if (fromStack instanceof ReferenceType && fromDesc instanceof ReferenceType) { - final ReferenceType rFromStack = (ReferenceType) fromStack; - final ReferenceType rFromDesc = (ReferenceType) fromDesc; - // TODO: This can possibly only be checked when using Staerk-et-al's "set of object types" instead - // of a single "wider cast object type" created during verification. - if ( ! rFromStack.isAssignmentCompatibleWith(rFromDesc) ) { - constraintViolated(o, "Expecting a '"+fromDesc+"' but found a '"+fromStack+ - "' on the stack (which is not assignment compatible)."); - } - referenceTypeIsInitialized(o, rFromStack); - } - else{ - constraintViolated(o, "Expecting a '"+fromDesc+"' but found a '"+fromStack+"' on the stack."); - } - } - } - - Type objref = stack().peek(nargs); - if (objref == Type.NULL) { - return; - } - if (! (objref instanceof ReferenceType) ) { - constraintViolated(o, "Expecting a reference type as 'objectref' on the stack, not a '"+objref+"'."); - } - referenceTypeIsInitialized(o, (ReferenceType) objref); - if (!(objref instanceof ObjectType)) { - if (!(objref instanceof ArrayType)) { // could be a ReturnaddressType - constraintViolated(o, "Expecting an ObjectType as 'objectref' on the stack, not a '"+objref+"'."); - } - else{ - objref = GENERIC_ARRAY; - } - } - - final String objref_classname = ((ObjectType) objref).getClassName(); - - final String theClass = o.getClassName(cpg); - - if ( ! Repository.instanceOf(objref_classname, theClass) ) { - constraintViolated(o, "The 'objref' item '"+objref+"' does not implement '"+theClass+"' as expected."); - } - } catch (final ClassNotFoundException e) { - // FIXME: maybe not the best way to handle this - throw new AssertionViolatedException("Missing class: " + e, e); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitIOR(final IOR o) { - if (stack().peek() != Type.INT) { - constraintViolated(o, "The value at the stack top is not of type 'int', but of type '"+stack().peek()+"'."); - } - if (stack().peek(1) != Type.INT) { - constraintViolated(o, "The value at the stack next-to-top is not of type 'int', but of type '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitIREM(final IREM o) { - if (stack().peek() != Type.INT) { - constraintViolated(o, "The value at the stack top is not of type 'int', but of type '"+stack().peek()+"'."); - } - if (stack().peek(1) != Type.INT) { - constraintViolated(o, "The value at the stack next-to-top is not of type 'int', but of type '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitIRETURN(final IRETURN o) { - if (stack().peek() != Type.INT) { - constraintViolated(o, "The value at the stack top is not of type 'int', but of type '"+stack().peek()+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitISHL(final ISHL o) { - if (stack().peek() != Type.INT) { - constraintViolated(o, "The value at the stack top is not of type 'int', but of type '"+stack().peek()+"'."); - } - if (stack().peek(1) != Type.INT) { - constraintViolated(o, "The value at the stack next-to-top is not of type 'int', but of type '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitISHR(final ISHR o) { - if (stack().peek() != Type.INT) { - constraintViolated(o, "The value at the stack top is not of type 'int', but of type '"+stack().peek()+"'."); - } - if (stack().peek(1) != Type.INT) { - constraintViolated(o, "The value at the stack next-to-top is not of type 'int', but of type '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitISTORE(final ISTORE o) { - //visitStoreInstruction(StoreInstruction) is called before. - - // Nothing else needs to be done here. - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitISUB(final ISUB o) { - if (stack().peek() != Type.INT) { - constraintViolated(o, "The value at the stack top is not of type 'int', but of type '"+stack().peek()+"'."); - } - if (stack().peek(1) != Type.INT) { - constraintViolated(o, "The value at the stack next-to-top is not of type 'int', but of type '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitIUSHR(final IUSHR o) { - if (stack().peek() != Type.INT) { - constraintViolated(o, "The value at the stack top is not of type 'int', but of type '"+stack().peek()+"'."); - } - if (stack().peek(1) != Type.INT) { - constraintViolated(o, "The value at the stack next-to-top is not of type 'int', but of type '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitIXOR(final IXOR o) { - if (stack().peek() != Type.INT) { - constraintViolated(o, "The value at the stack top is not of type 'int', but of type '"+stack().peek()+"'."); - } - if (stack().peek(1) != Type.INT) { - constraintViolated(o, "The value at the stack next-to-top is not of type 'int', but of type '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitJSR(final JSR o) { - // nothing to do here. - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitJSR_W(final JSR_W o) { - // nothing to do here. - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitL2D(final L2D o) { - if (stack().peek() != Type.LONG) { - constraintViolated(o, "The value at the stack top is not of type 'long', but of type '"+stack().peek()+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitL2F(final L2F o) { - if (stack().peek() != Type.LONG) { - constraintViolated(o, "The value at the stack top is not of type 'long', but of type '"+stack().peek()+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitL2I(final L2I o) { - if (stack().peek() != Type.LONG) { - constraintViolated(o, "The value at the stack top is not of type 'long', but of type '"+stack().peek()+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitLADD(final LADD o) { - if (stack().peek() != Type.LONG) { - constraintViolated(o, "The value at the stack top is not of type 'long', but of type '"+stack().peek()+"'."); - } - if (stack().peek(1) != Type.LONG) { - constraintViolated(o, "The value at the stack next-to-top is not of type 'long', but of type '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitLALOAD(final LALOAD o) { - indexOfInt(o, stack().peek()); - if (stack().peek(1) == Type.NULL) { - return; - } - if (! (stack().peek(1) instanceof ArrayType)) { - constraintViolated(o, "Stack next-to-top must be of type long[] but is '"+stack().peek(1)+"'."); - } - final Type t = ((ArrayType) (stack().peek(1))).getBasicType(); - if (t != Type.LONG) { - constraintViolated(o, "Stack next-to-top must be of type long[] but is '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitLAND(final LAND o) { - if (stack().peek() != Type.LONG) { - constraintViolated(o, "The value at the stack top is not of type 'long', but of type '"+stack().peek()+"'."); - } - if (stack().peek(1) != Type.LONG) { - constraintViolated(o, "The value at the stack next-to-top is not of type 'long', but of type '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitLASTORE(final LASTORE o) { - if (stack().peek() != Type.LONG) { - constraintViolated(o, "The value at the stack top is not of type 'long', but of type '"+stack().peek()+"'."); - } - indexOfInt(o, stack().peek(1)); - if (stack().peek(2) == Type.NULL) { - return; - } - if (! (stack().peek(2) instanceof ArrayType)) { - constraintViolated(o, "Stack next-to-next-to-top must be of type long[] but is '"+stack().peek(2)+"'."); - } - final Type t = ((ArrayType) (stack().peek(2))).getBasicType(); - if (t != Type.LONG) { - constraintViolated(o, "Stack next-to-next-to-top must be of type long[] but is '"+stack().peek(2)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitLCMP(final LCMP o) { - if (stack().peek() != Type.LONG) { - constraintViolated(o, "The value at the stack top is not of type 'long', but of type '"+stack().peek()+"'."); - } - if (stack().peek(1) != Type.LONG) { - constraintViolated(o, "The value at the stack next-to-top is not of type 'long', but of type '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitLCONST(final LCONST o) { - // Nothing to do here. - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitLDC(final LDC o) { - // visitCPInstruction is called first. - - final Constant c = cpg.getConstant(o.getIndex()); - if (! ( ( c instanceof ConstantInteger) || - ( c instanceof ConstantFloat ) || - ( c instanceof ConstantString ) || - ( c instanceof ConstantClass ) ) ) { - constraintViolated(o, - "Referenced constant should be a CONSTANT_Integer, a CONSTANT_Float, a CONSTANT_String or a CONSTANT_Class, but is '"+ - c + "'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - public void visitLDC_W(final LDC_W o) { - // visitCPInstruction is called first. - - final Constant c = cpg.getConstant(o.getIndex()); - if (! ( ( c instanceof ConstantInteger) || - ( c instanceof ConstantFloat ) || - ( c instanceof ConstantString ) || - ( c instanceof ConstantClass ) ) ) { - constraintViolated(o, - "Referenced constant should be a CONSTANT_Integer, a CONSTANT_Float, a CONSTANT_String or a CONSTANT_Class, but is '"+ - c + "'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitLDC2_W(final LDC2_W o) { - // visitCPInstruction is called first. - - final Constant c = cpg.getConstant(o.getIndex()); - if (! ( ( c instanceof ConstantLong) || - ( c instanceof ConstantDouble ) ) ) { - constraintViolated(o, - "Referenced constant should be a CONSTANT_Integer, a CONSTANT_Float or a CONSTANT_String, but is '"+c+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitLDIV(final LDIV o) { - if (stack().peek() != Type.LONG) { - constraintViolated(o, "The value at the stack top is not of type 'long', but of type '"+stack().peek()+"'."); - } - if (stack().peek(1) != Type.LONG) { - constraintViolated(o, "The value at the stack next-to-top is not of type 'long', but of type '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitLLOAD(final LLOAD o) { - //visitLoadInstruction(LoadInstruction) is called before. - - // Nothing else needs to be done here. - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitLMUL(final LMUL o) { - if (stack().peek() != Type.LONG) { - constraintViolated(o, "The value at the stack top is not of type 'long', but of type '"+stack().peek()+"'."); - } - if (stack().peek(1) != Type.LONG) { - constraintViolated(o, "The value at the stack next-to-top is not of type 'long', but of type '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitLNEG(final LNEG o) { - if (stack().peek() != Type.LONG) { - constraintViolated(o, "The value at the stack top is not of type 'long', but of type '"+stack().peek()+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitLOOKUPSWITCH(final LOOKUPSWITCH o) { - if (stack().peek() != Type.INT) { - constraintViolated(o, "The value at the stack top is not of type 'int', but of type '"+stack().peek()+"'."); - } - // See also pass 3a. - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitLOR(final LOR o) { - if (stack().peek() != Type.LONG) { - constraintViolated(o, "The value at the stack top is not of type 'long', but of type '"+stack().peek()+"'."); - } - if (stack().peek(1) != Type.LONG) { - constraintViolated(o, "The value at the stack next-to-top is not of type 'long', but of type '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitLREM(final LREM o) { - if (stack().peek() != Type.LONG) { - constraintViolated(o, "The value at the stack top is not of type 'long', but of type '"+stack().peek()+"'."); - } - if (stack().peek(1) != Type.LONG) { - constraintViolated(o, "The value at the stack next-to-top is not of type 'long', but of type '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitLRETURN(final LRETURN o) { - if (stack().peek() != Type.LONG) { - constraintViolated(o, "The value at the stack top is not of type 'long', but of type '"+stack().peek()+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitLSHL(final LSHL o) { - if (stack().peek() != Type.INT) { - constraintViolated(o, "The value at the stack top is not of type 'int', but of type '"+stack().peek()+"'."); - } - if (stack().peek(1) != Type.LONG) { - constraintViolated(o, "The value at the stack next-to-top is not of type 'long', but of type '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitLSHR(final LSHR o) { - if (stack().peek() != Type.INT) { - constraintViolated(o, "The value at the stack top is not of type 'int', but of type '"+stack().peek()+"'."); - } - if (stack().peek(1) != Type.LONG) { - constraintViolated(o, "The value at the stack next-to-top is not of type 'long', but of type '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitLSTORE(final LSTORE o) { - //visitStoreInstruction(StoreInstruction) is called before. - - // Nothing else needs to be done here. - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitLSUB(final LSUB o) { - if (stack().peek() != Type.LONG) { - constraintViolated(o, "The value at the stack top is not of type 'long', but of type '"+stack().peek()+"'."); - } - if (stack().peek(1) != Type.LONG) { - constraintViolated(o, "The value at the stack next-to-top is not of type 'long', but of type '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitLUSHR(final LUSHR o) { - if (stack().peek() != Type.INT) { - constraintViolated(o, "The value at the stack top is not of type 'int', but of type '"+stack().peek()+"'."); - } - if (stack().peek(1) != Type.LONG) { - constraintViolated(o, "The value at the stack next-to-top is not of type 'long', but of type '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitLXOR(final LXOR o) { - if (stack().peek() != Type.LONG) { - constraintViolated(o, "The value at the stack top is not of type 'long', but of type '"+stack().peek()+"'."); - } - if (stack().peek(1) != Type.LONG) { - constraintViolated(o, "The value at the stack next-to-top is not of type 'long', but of type '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitMONITORENTER(final MONITORENTER o) { - if (! ((stack().peek()) instanceof ReferenceType)) { - constraintViolated(o, "The stack top should be of a ReferenceType, but is '"+stack().peek()+"'."); - } - //referenceTypeIsInitialized(o, (ReferenceType) (stack().peek()) ); - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitMONITOREXIT(final MONITOREXIT o) { - if (! ((stack().peek()) instanceof ReferenceType)) { - constraintViolated(o, "The stack top should be of a ReferenceType, but is '"+stack().peek()+"'."); - } - //referenceTypeIsInitialized(o, (ReferenceType) (stack().peek()) ); - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitMULTIANEWARRAY(final MULTIANEWARRAY o) { - final int dimensions = o.getDimensions(); - // Dimensions argument is okay: see Pass 3a. - for (int i=0; i, see Pass 3a. - - } catch (final ClassNotFoundException e) { - // FIXME: maybe not the best way to handle this - throw new AssertionViolatedException("Missing class: " + e, e); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitRET(final RET o) { - if (! (locals().get(o.getIndex()) instanceof ReturnaddressType)) { - constraintViolated(o, "Expecting a ReturnaddressType in local variable "+o.getIndex()+"."); - } - if (locals().get(o.getIndex()) == ReturnaddressType.NO_TARGET) { - throw new AssertionViolatedException("RET expecting a target!"); - } - // Other constraints such as non-allowed overlapping subroutines are enforced - // while building the Subroutines data structure. - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitRETURN(final RETURN o) { - if (mg.getName().equals(Const.CONSTRUCTOR_NAME)) {// If we leave an method - if ((Frame.getThis() != null) && (!(mg.getClassName().equals(Type.OBJECT.getClassName()))) ) { - constraintViolated(o, "Leaving a constructor that itself did not call a constructor."); - } - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitSALOAD(final SALOAD o) { - indexOfInt(o, stack().peek()); - if (stack().peek(1) == Type.NULL) { - return; - } - if (! (stack().peek(1) instanceof ArrayType)) { - constraintViolated(o, "Stack next-to-top must be of type short[] but is '"+stack().peek(1)+"'."); - } - final Type t = ((ArrayType) (stack().peek(1))).getBasicType(); - if (t != Type.SHORT) { - constraintViolated(o, "Stack next-to-top must be of type short[] but is '"+stack().peek(1)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitSASTORE(final SASTORE o) { - if (stack().peek() != Type.INT) { - constraintViolated(o, "The value at the stack top is not of type 'int', but of type '"+stack().peek()+"'."); - } - indexOfInt(o, stack().peek(1)); - if (stack().peek(2) == Type.NULL) { - return; - } - if (! (stack().peek(2) instanceof ArrayType)) { - constraintViolated(o, "Stack next-to-next-to-top must be of type short[] but is '"+stack().peek(2)+"'."); - } - final Type t = ((ArrayType) (stack().peek(2))).getBasicType(); - if (t != Type.SHORT) { - constraintViolated(o, "Stack next-to-next-to-top must be of type short[] but is '"+stack().peek(2)+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitSIPUSH(final SIPUSH o) { - // nothing to do here. Generic visitXXX() methods did the trick before. - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitSWAP(final SWAP o) { - if (stack().peek().getSize() != 1) { - constraintViolated(o, "The value at the stack top is not of size '1', but of size '"+stack().peek().getSize()+"'."); - } - if (stack().peek(1).getSize() != 1) { - constraintViolated(o, - "The value at the stack next-to-top is not of size '1', but of size '"+stack().peek(1).getSize()+"'."); - } - } - - /** - * Ensures the specific preconditions of the said instruction. - */ - @Override - public void visitTABLESWITCH(final TABLESWITCH o) { - indexOfInt(o, stack().peek()); - // See Pass 3a. - } - -} - diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/structurals/InstructionContext.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/structurals/InstructionContext.java deleted file mode 100644 index 2bbcfe26..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/structurals/InstructionContext.java +++ /dev/null @@ -1,106 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.verifier.structurals; - - -import java.util.ArrayList; - -import org.apache.bcel.generic.InstructionHandle; - -/** - * An InstructionContext offers convenient access - * to information like control flow successors and - * such. - * - */ -public interface InstructionContext{ - - /** - * The getTag and setTag methods may be used for - * temporary flagging, such as graph colouring. - * Nothing in the InstructionContext object depends - * on the value of the tag. JustIce does not use it. - * - * @see #setTag(int tag) - */ - int getTag(); - - /** - * The getTag and setTag methods may be used for - * temporary flagging, such as graph colouring. - * Nothing in the InstructionContext object depends - * on the value of the tag. JustIce does not use it. - * - * @see #getTag() - */ - void setTag(int tag); - - /** - * This method symbolically executes the Instruction - * held in the InstructionContext. - * It "merges in" the incoming execution frame situation - * (see The Java Virtual Machine Specification, 2nd - * edition, page 146). - * By so doing, the outgoing execution frame situation - * is calculated. - * - * This method is JustIce-specific and is usually of - * no sense for users of the ControlFlowGraph class. - * They should use getInstruction().accept(Visitor), - * possibly in conjunction with the ExecutionVisitor. - * - * - * @see ControlFlowGraph - * @see ExecutionVisitor - * @see #getOutFrame(ArrayList) - * @return true - if and only if the "outgoing" frame situation - * changed from the one before execute()ing. - */ - boolean execute(Frame inFrame, ArrayList executionPredecessors, - InstConstraintVisitor icv, ExecutionVisitor ev); - - Frame getInFrame(); - - /** - * This method returns the outgoing execution frame situation; - * therefore it has to be calculated by execute(Frame, ArrayList) - * first. - * - * @see #execute(Frame, ArrayList, InstConstraintVisitor, ExecutionVisitor) - */ - Frame getOutFrame(ArrayList executionPredecessors); - - /** - * Returns the InstructionHandle this InstructionContext is wrapped around. - * - * @return The InstructionHandle this InstructionContext is wrapped around. - */ - InstructionHandle getInstruction(); - - /** - * Returns the usual control flow successors. - * @see #getExceptionHandlers() - */ - InstructionContext[] getSuccessors(); - - /** - * Returns the exception handlers that protect this instruction. - * They are special control flow successors. - */ - ExceptionHandler[] getExceptionHandlers(); -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/structurals/LocalVariables.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/structurals/LocalVariables.java deleted file mode 100644 index 88dac525..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/structurals/LocalVariables.java +++ /dev/null @@ -1,232 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.verifier.structurals; - - -import org.apache.bcel.generic.ReferenceType; -import org.apache.bcel.generic.Type; -import org.apache.bcel.verifier.exc.AssertionViolatedException; -import org.apache.bcel.verifier.exc.StructuralCodeConstraintException; - -/** - * This class implements an array of local variables used for symbolic JVM - * simulation. - */ -public class LocalVariables implements Cloneable { - - /** The Type[] containing the local variable slots. */ - private final Type[] locals; - - /** - * Creates a new LocalVariables object. - * - * @param localVariableCount local variable count. - */ - public LocalVariables(final int localVariableCount) { - locals = new Type[localVariableCount]; - for (int i=0; i stack = new ArrayList<>(); - - /** The maximum number of stack slots this OperandStack instance may hold. */ - private final int maxStack; - - /** - * Creates an empty stack with a maximum of maxStack slots. - */ - public OperandStack(final int maxStack) { - this.maxStack = maxStack; - } - - /** - * Creates an otherwise empty stack with a maximum of maxStack slots and - * the ObjectType 'obj' at the top. - */ - public OperandStack(final int maxStack, final ObjectType obj) { - this.maxStack = maxStack; - this.push(obj); - } - /** - * Returns a deep copy of this object; that means, the clone operates - * on a new stack. However, the Type objects on the stack are - * shared. - */ - @Override - public Object clone() { - final OperandStack newstack = new OperandStack(this.maxStack); - @SuppressWarnings("unchecked") // OK because this.stack is the same type - final ArrayList clone = (ArrayList) this.stack.clone(); - newstack.stack = clone; - return newstack; - } - - /** - * Clears the stack. - */ - public void clear() { - stack = new ArrayList<>(); - } - - /** @return a hash code value for the object. - */ - @Override - public int hashCode() { return stack.hashCode(); } - - /** - * Returns true if and only if this OperandStack - * equals another, meaning equal lengths and equal - * objects on the stacks. - */ - @Override - public boolean equals(final Object o) { - if (!(o instanceof OperandStack)) { - return false; - } - final OperandStack s = (OperandStack) o; - return this.stack.equals(s.stack); - } - - /** - * Returns a (typed!) clone of this. - * - * @see #clone() - */ - public OperandStack getClone() { - return (OperandStack) this.clone(); - } - - /** - * Returns true IFF this OperandStack is empty. - */ - public boolean isEmpty() { - return stack.isEmpty(); - } - - /** - * Returns the number of stack slots this stack can hold. - */ - public int maxStack() { - return this.maxStack; - } - - /** - * Returns the element on top of the stack. The element is not popped off the stack! - */ - public Type peek() { - return peek(0); - } - - /** - * Returns the element that's i elements below the top element; that means, - * iff i==0 the top element is returned. The element is not popped off the stack! - */ - public Type peek(final int i) { - return stack.get(size()-i-1); - } - - /** - * Returns the element on top of the stack. The element is popped off the stack. - */ - public Type pop() { - final Type e = stack.remove(size()-1); - return e; - } - - /** - * Pops i elements off the stack. ALWAYS RETURNS "null"!!! - */ - public Type pop(final int i) { - for (int j=0; j= maxStack) { - throw new AssertionViolatedException( - "OperandStack too small, should have thrown proper Exception elsewhere. Stack: "+this); - } - stack.add(type); - } - - /** - * Returns the size of this OperandStack; that means, how many Type objects there are. - */ - public int size() { - return stack.size(); - } - - /** - * Returns the number of stack slots used. - * @see #maxStack() - */ - public int slotsUsed() { - /* XXX change this to a better implementation using a variable - that keeps track of the actual slotsUsed()-value monitoring - all push()es and pop()s. - */ - int slots = 0; - for (int i=0; i ics = new Vector<>(); - /** The second elements from pairs in the queue. */ - private final List> ecs = new Vector<>(); - - /** - * Adds an (InstructionContext, ExecutionChain) pair to this queue. - * - * @param ic the InstructionContext - * @param executionChain the ExecutionChain - */ - public void add(final InstructionContext ic, final ArrayList executionChain) { - ics.add(ic); - ecs.add(executionChain); - } - - /** - * Tests if InstructionContext queue is empty. - * - * @return true if the InstructionContext queue is empty. - */ - public boolean isEmpty() { - return ics.isEmpty(); - } - - /** - * Removes a specific (InstructionContext, ExecutionChain) pair from their respective queues. - * - * @param i the index of the items to be removed - */ - public void remove(final int i) { - ics.remove(i); - ecs.remove(i); - } - - /** - * Gets a specific InstructionContext from the queue. - * - * @param i the index of the item to be fetched - * @return the indicated InstructionContext - */ - public InstructionContext getIC(final int i) { - return ics.get(i); - } - - /** - * Gets a specific ExecutionChain from the queue. - * - * @param i the index of the item to be fetched - * @return the indicated ExecutionChain - */ - public ArrayList getEC(final int i) { - return ecs.get(i); - } - - /** - * Gets the size of the InstructionContext queue. - * - * @return the size of the InstructionQueue - */ - public int size() { - return ics.size(); - } - } // end Inner Class InstructionContextQueue - - /** In DEBUG mode, the verification algorithm is not randomized. */ - private static final boolean DEBUG = true; - - /** The Verifier that created this. */ - private final Verifier myOwner; - - /** The method number to verify. */ - private final int methodNo; - - /** - * This class should only be instantiated by a Verifier. - * - * @see org.apache.bcel.verifier.Verifier - */ - public Pass3bVerifier(final Verifier owner, final int method_no) { - myOwner = owner; - this.methodNo = method_no; - } - - /** - * Whenever the outgoing frame - * situation of an InstructionContext changes, all its successors are - * put [back] into the queue [as if they were unvisited]. - * The proof of termination is about the existence of a - * fix point of frame merging. - */ - private void circulationPump(final MethodGen m,final ControlFlowGraph cfg, final InstructionContext start, - final Frame vanillaFrame, final InstConstraintVisitor icv, final ExecutionVisitor ev) { - final Random random = new Random(); - final InstructionContextQueue icq = new InstructionContextQueue(); - - start.execute(vanillaFrame, new ArrayList(), icv, ev); - // new ArrayList() <=> no Instruction was executed before - // => Top-Level routine (no jsr call before) - icq.add(start, new ArrayList()); - - // LOOP! - while (!icq.isEmpty()) { - InstructionContext u; - ArrayList ec; - if (!DEBUG) { - final int r = random.nextInt(icq.size()); - u = icq.getIC(r); - ec = icq.getEC(r); - icq.remove(r); - } - else{ - u = icq.getIC(0); - ec = icq.getEC(0); - icq.remove(0); - } - - @SuppressWarnings("unchecked") // ec is of type ArrayList - final - ArrayList oldchain = (ArrayList) (ec.clone()); - @SuppressWarnings("unchecked") // ec is of type ArrayList - final - ArrayList newchain = (ArrayList) (ec.clone()); - newchain.add(u); - - if ((u.getInstruction().getInstruction()) instanceof RET) { -//System.err.println(u); - // We can only follow _one_ successor, the one after the - // JSR that was recently executed. - final RET ret = (RET) (u.getInstruction().getInstruction()); - final ReturnaddressType t = (ReturnaddressType) u.getOutFrame(oldchain).getLocals().get(ret.getIndex()); - final InstructionContext theSuccessor = cfg.contextOf(t.getTarget()); - - // Sanity check - InstructionContext lastJSR = null; - int skip_jsr = 0; - for (int ss=oldchain.size()-1; ss >= 0; ss--) { - if (skip_jsr < 0) { - throw new AssertionViolatedException("More RET than JSR in execution chain?!"); - } -//System.err.println("+"+oldchain.get(ss)); - if ((oldchain.get(ss)).getInstruction().getInstruction() instanceof JsrInstruction) { - if (skip_jsr == 0) { - lastJSR = oldchain.get(ss); - break; - } - skip_jsr--; - } - if ((oldchain.get(ss)).getInstruction().getInstruction() instanceof RET) { - skip_jsr++; - } - } - if (lastJSR == null) { - throw new AssertionViolatedException("RET without a JSR before in ExecutionChain?! EC: '"+oldchain+"'."); - } - final JsrInstruction jsr = (JsrInstruction) (lastJSR.getInstruction().getInstruction()); - if ( theSuccessor != (cfg.contextOf(jsr.physicalSuccessor())) ) { - throw new AssertionViolatedException("RET '"+u.getInstruction()+"' info inconsistent: jump back to '"+ - theSuccessor+"' or '"+cfg.contextOf(jsr.physicalSuccessor())+"'?"); - } - - if (theSuccessor.execute(u.getOutFrame(oldchain), newchain, icv, ev)) { - @SuppressWarnings("unchecked") // newchain is already of type ArrayList - final - ArrayList newchainClone = (ArrayList) newchain.clone(); - icq.add(theSuccessor, newchainClone); - } - } - else{// "not a ret" - - // Normal successors. Add them to the queue of successors. - final InstructionContext[] succs = u.getSuccessors(); - for (final InstructionContext v : succs) { - if (v.execute(u.getOutFrame(oldchain), newchain, icv, ev)) { - @SuppressWarnings("unchecked") // newchain is already of type ArrayList - final - ArrayList newchainClone = (ArrayList) newchain.clone(); - icq.add(v, newchainClone); - } - } - }// end "not a ret" - - // Exception Handlers. Add them to the queue of successors. - // [subroutines are never protected; mandated by JustIce] - final ExceptionHandler[] exc_hds = u.getExceptionHandlers(); - for (final ExceptionHandler exc_hd : exc_hds) { - final InstructionContext v = cfg.contextOf(exc_hd.getHandlerStart()); - // TODO: the "oldchain" and "newchain" is used to determine the subroutine - // we're in (by searching for the last JSR) by the InstructionContext - // implementation. Therefore, we should not use this chain mechanism - // when dealing with exception handlers. - // Example: a JSR with an exception handler as its successor does not - // mean we're in a subroutine if we go to the exception handler. - // We should address this problem later; by now we simply "cut" the chain - // by using an empty chain for the exception handlers. - //if (v.execute(new Frame(u.getOutFrame(oldchain).getLocals(), - // new OperandStack (u.getOutFrame().getStack().maxStack(), - // (exc_hds[s].getExceptionType()==null? Type.THROWABLE : exc_hds[s].getExceptionType())) ), newchain), icv, ev) { - //icq.add(v, (ArrayList) newchain.clone()); - if (v.execute(new Frame(u.getOutFrame(oldchain).getLocals(), - new OperandStack (u.getOutFrame(oldchain).getStack().maxStack(), - exc_hd.getExceptionType()==null? Type.THROWABLE : exc_hd.getExceptionType())), - new ArrayList(), icv, ev)) { - icq.add(v, new ArrayList()); - } - } - - }// while (!icq.isEmpty()) END - - InstructionHandle ih = start.getInstruction(); - do{ - if ((ih.getInstruction() instanceof ReturnInstruction) && (!(cfg.isDead(ih)))) { - final InstructionContext ic = cfg.contextOf(ih); - // TODO: This is buggy, we check only the top-level return instructions this way. - // Maybe some maniac returns from a method when in a subroutine? - final Frame f = ic.getOutFrame(new ArrayList()); - final LocalVariables lvs = f.getLocals(); - for (int i=0; i= 1) { - returnedType = inStack.peek(); - } else { - returnedType = Type.VOID; - } - - if (returnedType != null) { - if (returnedType instanceof ReferenceType) { - try { - if (!((ReferenceType) returnedType).isCastableTo(m.getReturnType())) { - invalidReturnTypeError(returnedType, m); - } - } catch (final ClassNotFoundException e) { - // Don't know what do do now, so raise RuntimeException - throw new IllegalArgumentException(e); - } - } else if (!returnedType.equals(m.getReturnType().normalizeForStackOrLocal())) { - invalidReturnTypeError(returnedType, m); - } - } - } - } while ((ih = ih.getNext()) != null); - - } - - /** - * Throws an exception indicating the returned type is not compatible with the return type of the given method. - * - * @param returnedType the type of the returned expression - * @param m the method we are processing - * @throws StructuralCodeConstraintException always - * @since 6.0 - */ - public void invalidReturnTypeError(final Type returnedType, final MethodGen m) { - throw new StructuralCodeConstraintException( - "Returned type "+returnedType+" does not match Method's return type "+m.getReturnType()); - } - - /** - * Pass 3b implements the data flow analysis as described in the Java Virtual - * Machine Specification, Second Edition. - * Later versions will use LocalVariablesInfo objects to verify if the - * verifier-inferred types and the class file's debug information (LocalVariables - * attributes) match [TODO]. - * - * @see org.apache.bcel.verifier.statics.LocalVariablesInfo - * @see org.apache.bcel.verifier.statics.Pass2Verifier#getLocalVariablesInfo(int) - */ - @Override - public VerificationResult do_verify() { - if (! myOwner.doPass3a(methodNo).equals(VerificationResult.VR_OK)) { - return VerificationResult.VR_NOTYET; - } - - // Pass 3a ran before, so it's safe to assume the JavaClass object is - // in the BCEL repository. - JavaClass jc; - try { - jc = Repository.lookupClass(myOwner.getClassName()); - } catch (final ClassNotFoundException e) { - // FIXME: maybe not the best way to handle this - throw new AssertionViolatedException("Missing class: " + e, e); - } - - final ConstantPoolGen constantPoolGen = new ConstantPoolGen(jc.getConstantPool()); - // Init Visitors - final InstConstraintVisitor icv = new InstConstraintVisitor(); - icv.setConstantPoolGen(constantPoolGen); - - final ExecutionVisitor ev = new ExecutionVisitor(); - ev.setConstantPoolGen(constantPoolGen); - - final Method[] methods = jc.getMethods(); // Method no "methodNo" exists, we ran Pass3a before on it! - - try{ - - final MethodGen mg = new MethodGen(methods[methodNo], myOwner.getClassName(), constantPoolGen); - - icv.setMethodGen(mg); - - ////////////// DFA BEGINS HERE //////////////// - if (! (mg.isAbstract() || mg.isNative()) ) { // IF mg HAS CODE (See pass 2) - - final ControlFlowGraph cfg = new ControlFlowGraph(mg); - - // Build the initial frame situation for this method. - final Frame f = new Frame(mg.getMaxLocals(),mg.getMaxStack()); - if ( !mg.isStatic() ) { - if (mg.getName().equals(Const.CONSTRUCTOR_NAME)) { - Frame.setThis(new UninitializedObjectType(ObjectType.getInstance(jc.getClassName()))); - f.getLocals().set(0, Frame.getThis()); - } - else{ - Frame.setThis(null); - f.getLocals().set(0, ObjectType.getInstance(jc.getClassName())); - } - } - final Type[] argtypes = mg.getArgumentTypes(); - int twoslotoffset = 0; - for (int j=0; jMust not - * be invoked on the 'top-level subroutine'. - * - * @return The JsrInstructions that have the first instruction of this subroutine as their target. - */ - InstructionHandle[] getEnteringJsrInstructions(); - - /** - * Returns the one and only RET that leaves the subroutine. Note that JustIce has a pretty rigid notion of a - * subroutine. Must not be invoked on the 'top-level subroutine'. - * - * @return The one and only RET that leaves the subroutine. - * - * @see Subroutines - */ - InstructionHandle getLeavingRET(); - - /** - * Returns all instructions that together form this subroutine. Note that an instruction is part of exactly one - * subroutine (the top-level code is considered to be a special subroutine) - else it is not reachable at all (dead - * code). - * - * @return All instructions that together form this subroutine. - */ - InstructionHandle[] getInstructions(); - - /** - * Returns if the given InstructionHandle refers to an instruction that is part of this subroutine. This is a - * convenience method that saves iteration over the InstructionHandle objects returned by getInstructions(). - * - * @param inst The InstructionHandle to test. - * @return Whether the given InstructionHandle refers to an instruction that is part of this subroutine. - * - * @see #getInstructions() - */ - boolean contains(InstructionHandle inst); - - /** - * Returns an int[] containing the indices of the local variable slots accessed by this Subroutine (read-accessed, - * write-accessed or both); local variables referenced by subroutines of this subroutine are not included. - * - * @return An int[] containing the indices of the local variable slots. - * @see #getRecursivelyAccessedLocalsIndices() - */ - int[] getAccessedLocalsIndices(); - - /** - * Returns an int[] containing the indices of the local variable slots accessed by this Subroutine (read-accessed, - * write-accessed or both); local variables referenced by subroutines of this subroutine are included. - * - * @return An int[] containing the indices of the local variable slots. - * @see #getAccessedLocalsIndices() - */ - int[] getRecursivelyAccessedLocalsIndices(); - - /** - * Returns the subroutines that are directly called from this subroutine. - * - * @return The subroutines that are directly called from this subroutine. - */ - Subroutine[] subSubs(); -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/structurals/Subroutines.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/structurals/Subroutines.java deleted file mode 100644 index 7247926c..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/structurals/Subroutines.java +++ /dev/null @@ -1,682 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.verifier.structurals; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.apache.bcel.generic.ASTORE; -import org.apache.bcel.generic.ATHROW; -import org.apache.bcel.generic.BranchInstruction; -import org.apache.bcel.generic.CodeExceptionGen; -import org.apache.bcel.generic.GotoInstruction; -import org.apache.bcel.generic.IndexedInstruction; -import org.apache.bcel.generic.Instruction; -import org.apache.bcel.generic.InstructionHandle; -import org.apache.bcel.generic.JsrInstruction; -import org.apache.bcel.generic.LocalVariableInstruction; -import org.apache.bcel.generic.MethodGen; -import org.apache.bcel.generic.RET; -import org.apache.bcel.generic.ReturnInstruction; -import org.apache.bcel.generic.Select; -import org.apache.bcel.verifier.exc.AssertionViolatedException; -import org.apache.bcel.verifier.exc.StructuralCodeConstraintException; - -/** - * Instances of this class contain information about the subroutines - * found in a code array of a method. - * This implementation considers the top-level (the instructions - * reachable without a JSR or JSR_W starting off from the first - * instruction in a code array of a method) being a special subroutine; - * see getTopLevel() for that. - * Please note that the definition of subroutines in the Java Virtual - * Machine Specification, Second Edition is somewhat incomplete. - * Therefore, JustIce uses an own, more rigid notion. - * Basically, a subroutine is a piece of code that starts at the target - * of a JSR of JSR_W instruction and ends at a corresponding RET - * instruction. Note also that the control flow of a subroutine - * may be complex and non-linear; and that subroutines may be nested. - * JustIce also mandates subroutines not to be protected by exception - * handling code (for the sake of control flow predictability). - * To understand JustIce's notion of subroutines, please read - * - * TODO: refer to the paper. - * - * @see #getTopLevel() - */ -public class Subroutines{ - /** - * This inner class implements the Subroutine interface. - */ - private class SubroutineImpl implements Subroutine{ - /** - * UNSET, a symbol for an uninitialized localVariable - * field. This is used for the "top-level" Subroutine; - * i.e. no subroutine. - */ - private static final int UNSET = -1; - - /** - * The Local Variable slot where the first - * instruction of this subroutine (an ASTORE) stores - * the JsrInstruction's ReturnAddress in and - * the RET of this subroutine operates on. - */ - private int localVariable = UNSET; - - /** The instructions that belong to this subroutine. */ - private final Set instructions = new HashSet<>(); // Elements: InstructionHandle - - /* - * Refer to the Subroutine interface for documentation. - */ - @Override - public boolean contains(final InstructionHandle inst) { - return instructions.contains(inst); - } - - /** - * The JSR or JSR_W instructions that define this - * subroutine by targeting it. - */ - private final Set theJSRs = new HashSet<>(); - - /** - * The RET instruction that leaves this subroutine. - */ - private InstructionHandle theRET; - - /** - * Returns a String representation of this object, merely - * for debugging purposes. - * (Internal) Warning: Verbosity on a problematic subroutine may cause - * stack overflow errors due to recursive subSubs() calls. - * Don't use this, then. - */ - @Override - public String toString() { - final StringBuilder ret = new StringBuilder(); - ret.append("Subroutine: Local variable is '").append(localVariable); - ret.append("', JSRs are '").append(theJSRs); - ret.append("', RET is '").append(theRET); - ret.append("', Instructions: '").append(instructions).append("'."); - - ret.append(" Accessed local variable slots: '"); - int[] alv = getAccessedLocalsIndices(); - for (final int element : alv) { - ret.append(element);ret.append(" "); - } - ret.append("'."); - - ret.append(" Recursively (via subsub...routines) accessed local variable slots: '"); - alv = getRecursivelyAccessedLocalsIndices(); - for (final int element : alv) { - ret.append(element);ret.append(" "); - } - ret.append("'."); - - return ret.toString(); - } - - /** - * Sets the leaving RET instruction. Must be invoked after all instructions are added. - * Must not be invoked for top-level 'subroutine'. - */ - void setLeavingRET() { - if (localVariable == UNSET) { - throw new AssertionViolatedException( - "setLeavingRET() called for top-level 'subroutine' or forgot to set local variable first."); - } - InstructionHandle ret = null; - for (final InstructionHandle actual : instructions) { - if (actual.getInstruction() instanceof RET) { - if (ret != null) { - throw new StructuralCodeConstraintException( - "Subroutine with more then one RET detected: '"+ret+"' and '"+actual+"'."); - } - ret = actual; - } - } - if (ret == null) { - throw new StructuralCodeConstraintException("Subroutine without a RET detected."); - } - if (((RET) ret.getInstruction()).getIndex() != localVariable) { - throw new StructuralCodeConstraintException( - "Subroutine uses '"+ret+"' which does not match the correct local variable '"+localVariable+"'."); - } - theRET = ret; - } - - /* - * Refer to the Subroutine interface for documentation. - */ - @Override - public InstructionHandle[] getEnteringJsrInstructions() { - if (this == getTopLevel()) { - throw new AssertionViolatedException("getLeavingRET() called on top level pseudo-subroutine."); - } - final InstructionHandle[] jsrs = new InstructionHandle[theJSRs.size()]; - return theJSRs.toArray(jsrs); - } - - /** - * Adds a new JSR or JSR_W that has this subroutine as its target. - */ - public void addEnteringJsrInstruction(final InstructionHandle jsrInst) { - if ( (jsrInst == null) || (! (jsrInst.getInstruction() instanceof JsrInstruction))) { - throw new AssertionViolatedException("Expecting JsrInstruction InstructionHandle."); - } - if (localVariable == UNSET) { - throw new AssertionViolatedException("Set the localVariable first!"); - } - // Something is wrong when an ASTORE is targeted that does not operate on the same local variable than the rest of the - // JsrInstruction-targets and the RET. - // (We don't know out leader here so we cannot check if we're really targeted!) - if (localVariable != ((ASTORE) (((JsrInstruction) jsrInst.getInstruction()).getTarget().getInstruction())).getIndex()) { - throw new AssertionViolatedException("Setting a wrong JsrInstruction."); - } - theJSRs.add(jsrInst); - } - - /* - * Refer to the Subroutine interface for documentation. - */ - @Override - public InstructionHandle getLeavingRET() { - if (this == getTopLevel()) { - throw new AssertionViolatedException("getLeavingRET() called on top level pseudo-subroutine."); - } - return theRET; - } - - /* - * Refer to the Subroutine interface for documentation. - */ - @Override - public InstructionHandle[] getInstructions() { - final InstructionHandle[] ret = new InstructionHandle[instructions.size()]; - return instructions.toArray(ret); - } - - /* - * Adds an instruction to this subroutine. - * All instructions must have been added before invoking setLeavingRET(). - * @see #setLeavingRET - */ - void addInstruction(final InstructionHandle ih) { - if (theRET != null) { - throw new AssertionViolatedException("All instructions must have been added before invoking setLeavingRET()."); - } - instructions.add(ih); - } - - /* Satisfies Subroutine.getRecursivelyAccessedLocalsIndices(). */ - @Override - public int[] getRecursivelyAccessedLocalsIndices() { - final Set s = new HashSet<>(); - final int[] lvs = getAccessedLocalsIndices(); - for (final int lv : lvs) { - s.add(Integer.valueOf(lv)); - } - _getRecursivelyAccessedLocalsIndicesHelper(s, this.subSubs()); - final int[] ret = new int[s.size()]; - int j=-1; - for (final Integer index : s) { - j++; - ret[j] = index.intValue(); - } - return ret; - } - - /** - * A recursive helper method for getRecursivelyAccessedLocalsIndices(). - * @see #getRecursivelyAccessedLocalsIndices() - */ - private void _getRecursivelyAccessedLocalsIndicesHelper(final Set s, final Subroutine[] subs) { - for (final Subroutine sub : subs) { - final int[] lvs = sub.getAccessedLocalsIndices(); - for (final int lv : lvs) { - s.add(Integer.valueOf(lv)); - } - if(sub.subSubs().length != 0) { - _getRecursivelyAccessedLocalsIndicesHelper(s, sub.subSubs()); - } - } - } - - /* - * Satisfies Subroutine.getAccessedLocalIndices(). - */ - @Override - public int[] getAccessedLocalsIndices() { - //TODO: Implement caching. - final Set acc = new HashSet<>(); - if (theRET == null && this != getTopLevel()) { - throw new AssertionViolatedException( - "This subroutine object must be built up completely before calculating accessed locals."); - } - { - for (final InstructionHandle ih : instructions) { - // RET is not a LocalVariableInstruction in the current version of BCEL. - if (ih.getInstruction() instanceof LocalVariableInstruction || ih.getInstruction() instanceof RET) { - final int idx = ((IndexedInstruction) (ih.getInstruction())).getIndex(); - acc.add(Integer.valueOf(idx)); - // LONG? DOUBLE?. - try{ - // LocalVariableInstruction instances are typed without the need to look into - // the constant pool. - if (ih.getInstruction() instanceof LocalVariableInstruction) { - final int s = ((LocalVariableInstruction) ih.getInstruction()).getType(null).getSize(); - if (s==2) { - acc.add(Integer.valueOf(idx+1)); - } - } - } - catch(final RuntimeException re) { - throw new AssertionViolatedException("BCEL did not like NULL as a ConstantPoolGen object.", re); - } - } - } - } - - { - final int[] ret = new int[acc.size()]; - int j=-1; - for (final Integer accessedLocal : acc) { - j++; - ret[j] = accessedLocal.intValue(); - } - return ret; - } - } - - /* - * Satisfies Subroutine.subSubs(). - */ - @Override - public Subroutine[] subSubs() { - final Set h = new HashSet<>(); - - for (final InstructionHandle ih : instructions) { - final Instruction inst = ih.getInstruction(); - if (inst instanceof JsrInstruction) { - final InstructionHandle targ = ((JsrInstruction) inst).getTarget(); - h.add(getSubroutine(targ)); - } - } - final Subroutine[] ret = new Subroutine[h.size()]; - return h.toArray(ret); - } - - /* - * Sets the local variable slot the ASTORE that is targeted - * by the JsrInstructions of this subroutine operates on. - * This subroutine's RET operates on that same local variable - * slot, of course. - */ - void setLocalVariable(final int i) { - if (localVariable != UNSET) { - throw new AssertionViolatedException("localVariable set twice."); - } - localVariable = i; - } - - /** - * The default constructor. - */ - public SubroutineImpl() { - } - - }// end Inner Class SubrouteImpl - - //Node coloring constants - private enum ColourConstants{ - WHITE, - GRAY, - BLACK - } - - /** - * The map containing the subroutines found. - * Key: InstructionHandle of the leader of the subroutine. - * Elements: SubroutineImpl objects. - */ - private final Map subroutines = new HashMap<>(); - - /** - * This is referring to a special subroutine, namely the - * top level. This is not really a subroutine but we use - * it to distinguish between top level instructions and - * unreachable instructions. - */ - // CHECKSTYLE:OFF - public final Subroutine TOPLEVEL; // TODO can this be made private? - // CHECKSTYLE:ON - - /** - * Constructor. - * @param mg A MethodGen object representing method to - * create the Subroutine objects of. - * Assumes that JustIce strict checks are needed. - */ - public Subroutines(final MethodGen mg) { - this(mg, true); - } - - /** - * Constructor. - * @param mg A MethodGen object representing method to - * create the Subroutine objects of. - * @param enableJustIceCheck whether to enable additional JustIce checks - * @since 6.0 - */ - public Subroutines(final MethodGen mg, final boolean enableJustIceCheck) { - final InstructionHandle[] all = mg.getInstructionList().getInstructionHandles(); - final CodeExceptionGen[] handlers = mg.getExceptionHandlers(); - - // Define our "Toplevel" fake subroutine. - TOPLEVEL = new SubroutineImpl(); - - // Calculate "real" subroutines. - final Set sub_leaders = new HashSet<>(); // Elements: InstructionHandle - for (final InstructionHandle element : all) { - final Instruction inst = element.getInstruction(); - if (inst instanceof JsrInstruction) { - sub_leaders.add(((JsrInstruction) inst).getTarget()); - } - } - - // Build up the database. - for (final InstructionHandle astore : sub_leaders) { - final SubroutineImpl sr = new SubroutineImpl(); - sr.setLocalVariable( ((ASTORE) (astore.getInstruction())).getIndex() ); - subroutines.put(astore, sr); - } - - // Fake it a bit. We want a virtual "TopLevel" subroutine. - subroutines.put(all[0], TOPLEVEL); - sub_leaders.add(all[0]); - - // Tell the subroutines about their JsrInstructions. - // Note that there cannot be a JSR targeting the top-level - // since "Jsr 0" is disallowed in Pass 3a. - // Instructions shared by a subroutine and the toplevel are - // disallowed and checked below, after the BFS. - for (final InstructionHandle element : all) { - final Instruction inst = element.getInstruction(); - if (inst instanceof JsrInstruction) { - final InstructionHandle leader = ((JsrInstruction) inst).getTarget(); - ((SubroutineImpl) getSubroutine(leader)).addEnteringJsrInstruction(element); - } - } - - // Now do a BFS from every subroutine leader to find all the - // instructions that belong to a subroutine. - // we don't want to assign an instruction to two or more Subroutine objects. - final Set instructions_assigned = new HashSet<>(); - - //Graph colouring. Key: InstructionHandle, Value: ColourConstants enum . - final Map colors = new HashMap<>(); - - final List Q = new ArrayList<>(); - for (final InstructionHandle actual : sub_leaders) { - // Do some BFS with "actual" as the root of the graph. - // Init colors - for (final InstructionHandle element : all) { - colors.put(element, ColourConstants.WHITE); - } - colors.put(actual, ColourConstants.GRAY); - // Init Queue - - Q.clear(); - Q.add(actual); // add(Obj) adds to the end, remove(0) removes from the start. - - /* - * BFS ALGORITHM MODIFICATION: - * Start out with multiple "root" nodes, as exception handlers are starting points of top-level code, too. - * [why top-level? - * TODO: Refer to the special JustIce notion of subroutines.] - */ - if (actual == all[0]) { - for (final CodeExceptionGen handler : handlers) { - colors.put(handler.getHandlerPC(), ColourConstants.GRAY); - Q.add(handler.getHandlerPC()); - } - } - /* CONTINUE NORMAL BFS ALGORITHM */ - - // Loop until Queue is empty - while (Q.size() != 0) { - final InstructionHandle u = Q.remove(0); - final InstructionHandle[] successors = getSuccessors(u); - for (final InstructionHandle successor : successors) { - if (colors.get(successor) == ColourConstants.WHITE) { - colors.put(successor, ColourConstants.GRAY); - Q.add(successor); - } - } - colors.put(u, ColourConstants.BLACK); - } - // BFS ended above. - for (final InstructionHandle element : all) { - if (colors.get(element) == ColourConstants.BLACK) { - ((SubroutineImpl) (actual==all[0]?getTopLevel():getSubroutine(actual))).addInstruction(element); - if (instructions_assigned.contains(element)) { - throw new StructuralCodeConstraintException("Instruction '"+element+ - "' is part of more than one subroutine (or of the top level and a subroutine)."); - } - instructions_assigned.add(element); - } - } - if (actual != all[0]) {// If we don't deal with the top-level 'subroutine' - ((SubroutineImpl) getSubroutine(actual)).setLeavingRET(); - } - } - - if (enableJustIceCheck) { - // Now make sure no instruction of a Subroutine is protected by exception handling code - // as is mandated by JustIces notion of subroutines. - for (final CodeExceptionGen handler : handlers) { - InstructionHandle _protected = handler.getStartPC(); - while (_protected != handler.getEndPC().getNext()) { - // Note the inclusive/inclusive notation of "generic API" exception handlers! - for (final Subroutine sub : subroutines.values()) { - if (sub != subroutines.get(all[0])) { // We don't want to forbid top-level exception handlers. - if (sub.contains(_protected)) { - throw new StructuralCodeConstraintException("Subroutine instruction '"+_protected+ - "' is protected by an exception handler, '"+handler+ - "'. This is forbidden by the JustIce verifier due to its clear definition of subroutines."); - } - } - } - _protected = _protected.getNext(); - } - } - } - - // Now make sure no subroutine is calling a subroutine - // that uses the same local variable for the RET as themselves - // (recursively). - // This includes that subroutines may not call themselves - // recursively, even not through intermediate calls to other - // subroutines. - noRecursiveCalls(getTopLevel(), new HashSet()); - - } - - /** - * This (recursive) utility method makes sure that - * no subroutine is calling a subroutine - * that uses the same local variable for the RET as themselves - * (recursively). - * This includes that subroutines may not call themselves - * recursively, even not through intermediate calls to other - * subroutines. - * - * @throws StructuralCodeConstraintException if the above constraint is not satisfied. - */ - private void noRecursiveCalls(final Subroutine sub, final Set set) { - final Subroutine[] subs = sub.subSubs(); - - for (final Subroutine sub2 : subs) { - final int index = ((RET) (sub2.getLeavingRET().getInstruction())).getIndex(); - - if (!set.add(Integer.valueOf(index))) { - // Don't use toString() here because of possibly infinite recursive subSubs() calls then. - final SubroutineImpl si = (SubroutineImpl) sub2; - throw new StructuralCodeConstraintException("Subroutine with local variable '"+si.localVariable+"', JSRs '"+ - si.theJSRs+"', RET '"+si.theRET+ - "' is called by a subroutine which uses the same local variable index as itself; maybe even a recursive call?"+ - " JustIce's clean definition of a subroutine forbids both."); - } - - noRecursiveCalls(sub2, set); - - set.remove(Integer.valueOf(index)); - } - } - - /** - * Returns the Subroutine object associated with the given - * leader (that is, the first instruction of the subroutine). - * You must not use this to get the top-level instructions - * modeled as a Subroutine object. - * - * @see #getTopLevel() - */ - public Subroutine getSubroutine(final InstructionHandle leader) { - final Subroutine ret = subroutines.get(leader); - - if (ret == null) { - throw new AssertionViolatedException( - "Subroutine requested for an InstructionHandle that is not a leader of a subroutine."); - } - - if (ret == TOPLEVEL) { - throw new AssertionViolatedException("TOPLEVEL special subroutine requested; use getTopLevel()."); - } - - return ret; - } - - /** - * Returns the subroutine object associated with the - * given instruction. This is a costly operation, you - * should consider using getSubroutine(InstructionHandle). - * Returns 'null' if the given InstructionHandle lies - * in so-called 'dead code', i.e. code that can never - * be executed. - * - * @see #getSubroutine(InstructionHandle) - * @see #getTopLevel() - */ - public Subroutine subroutineOf(final InstructionHandle any) { - for (final Subroutine s : subroutines.values()) { - if (s.contains(any)) { - return s; - } - } - System.err.println("DEBUG: Please verify '"+any.toString(true)+"' lies in dead code."); - return null; - //throw new AssertionViolatedException("No subroutine for InstructionHandle found (DEAD CODE?)."); - } - - /** - * For easy handling, the piece of code that is not a - * subroutine, the top-level, is also modeled as a Subroutine - * object. - * It is a special Subroutine object where you must not invoke - * getEnteringJsrInstructions() or getLeavingRET(). - * - * @see Subroutine#getEnteringJsrInstructions() - * @see Subroutine#getLeavingRET() - */ - public Subroutine getTopLevel() { - return TOPLEVEL; - } - /** - * A utility method that calculates the successors of a given InstructionHandle - * in the same subroutine. That means, a RET does not have any successors - * as defined here. A JsrInstruction has its physical successor as its successor - * (opposed to its target) as defined here. - */ - private static InstructionHandle[] getSuccessors(final InstructionHandle instruction) { - final InstructionHandle[] empty = new InstructionHandle[0]; - final InstructionHandle[] single = new InstructionHandle[1]; - - final Instruction inst = instruction.getInstruction(); - - if (inst instanceof RET) { - return empty; - } - - // Terminates method normally. - if (inst instanceof ReturnInstruction) { - return empty; - } - - // Terminates method abnormally, because JustIce mandates - // subroutines not to be protected by exception handlers. - if (inst instanceof ATHROW) { - return empty; - } - - // See method comment. - if (inst instanceof JsrInstruction) { - single[0] = instruction.getNext(); - return single; - } - - if (inst instanceof GotoInstruction) { - single[0] = ((GotoInstruction) inst).getTarget(); - return single; - } - - if (inst instanceof BranchInstruction) { - if (inst instanceof Select) { - // BCEL's getTargets() returns only the non-default targets, - // thanks to Eli Tilevich for reporting. - final InstructionHandle[] matchTargets = ((Select) inst).getTargets(); - final InstructionHandle[] ret = new InstructionHandle[matchTargets.length+1]; - ret[0] = ((Select) inst).getTarget(); - System.arraycopy(matchTargets, 0, ret, 1, matchTargets.length); - return ret; - } - final InstructionHandle[] pair = new InstructionHandle[2]; - pair[0] = instruction.getNext(); - pair[1] = ((BranchInstruction) inst).getTarget(); - return pair; - } - - // default case: Fall through. - single[0] = instruction.getNext(); - return single; - } - - /** - * Returns a String representation of this object; merely for debugging puposes. - */ - @Override - public String toString() { - return "---\n"+subroutines+"\n---\n"; - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/structurals/UninitializedObjectType.java b/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/structurals/UninitializedObjectType.java deleted file mode 100644 index 78fe4cca..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/structurals/UninitializedObjectType.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.apache.bcel.verifier.structurals; - - -import org.apache.bcel.Const; -import org.apache.bcel.Constants; -import org.apache.bcel.generic.ObjectType; -import org.apache.bcel.generic.ReferenceType; - -/** - * This class represents an uninitialized object type; see The Java - * Virtual Machine Specification, Second Edition, page 147: 4.9.4 for - * more details. - * - */ -public class UninitializedObjectType extends ReferenceType implements Constants { - - /** The "initialized" version. */ - private final ObjectType initialized; - - /** Creates a new instance. */ - public UninitializedObjectType(final ObjectType t) { - super(Const.T_UNKNOWN, ""); - initialized = t; - } - - /** - * Returns the ObjectType of the same class as the one of the uninitialized object - * represented by this UninitializedObjectType instance. - */ - public ObjectType getInitialized() { - return initialized; - } - - /** @return a hash code value for the object. - */ - @Override - public int hashCode() { return initialized.hashCode(); } - - /** - * Returns true on equality of this and o. - * Equality means the ObjectType instances of "initialized" - * equal one another in this and the o instance. - * - */ - @Override - public boolean equals(final Object o) { - if (! (o instanceof UninitializedObjectType)) { - return false; - } - return initialized.equals(((UninitializedObjectType)o).initialized); - } -} diff --git a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/structurals/package.html b/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/structurals/package.html deleted file mode 100644 index 0b0cebcf..00000000 --- a/bundles/jamopp.parser.bcel/src/org/apache/bcel/verifier/structurals/package.html +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - -Provides a PassVerifier class mostly used internally by JustIce, yielding a control flow graph for public use as -a nice side effect. - -

Package Specification

- -Contained in this package is a PassVerifier class for use with the JustIce verifier and its utility classes. -Only the pass performing what Sun calls "Structural Constraints on Java Virtual Machine Code" -has a PassVerifier class here. JustIce calls this pass "Pass 3b". - - - diff --git a/bundles/jamopp.parser.jdt.singlefile/.classpath b/bundles/jamopp.parser.jdt.singlefile/.classpath deleted file mode 100644 index 1a821310..00000000 --- a/bundles/jamopp.parser.jdt.singlefile/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/bundles/jamopp.parser.jdt.singlefile/.project b/bundles/jamopp.parser.jdt.singlefile/.project deleted file mode 100644 index 2ffd2171..00000000 --- a/bundles/jamopp.parser.jdt.singlefile/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - jamopp.parser.jdt.singlefile - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - net.sf.eclipsecs.core.CheckstyleBuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.pde.PluginNature - net.sf.eclipsecs.core.CheckstyleNature - - diff --git a/bundles/jamopp.parser.jdt.singlefile/META-INF/MANIFEST.MF b/bundles/jamopp.parser.jdt.singlefile/META-INF/MANIFEST.MF deleted file mode 100644 index a312555f..00000000 --- a/bundles/jamopp.parser.jdt.singlefile/META-INF/MANIFEST.MF +++ /dev/null @@ -1,16 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: JaMoPP JDT-based Parser for single files -Bundle-SymbolicName: jamopp.parser.jdt.singlefile -Bundle-Version: 5.1.0.qualifier -Bundle-Vendor: Martin Armbruster -Automatic-Module-Name: jamopp.parser.jdt.singlefile -Bundle-RequiredExecutionEnvironment: JavaSE-17 -Require-Bundle: org.eclipse.jdt.core, - org.eclipse.core.runtime, - org.emftext.language.java, - org.eclipse.emf.ecore, - jamopp.parser, - jamopp.resolution, - org.apache.log4j -Export-Package: jamopp.parser.jdt.singlefile diff --git a/bundles/jamopp.parser.jdt.singlefile/build.properties b/bundles/jamopp.parser.jdt.singlefile/build.properties deleted file mode 100644 index 34d2e4d2..00000000 --- a/bundles/jamopp.parser.jdt.singlefile/build.properties +++ /dev/null @@ -1,4 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - . diff --git a/bundles/jamopp.parser.jdt.singlefile/pom.xml b/bundles/jamopp.parser.jdt.singlefile/pom.xml new file mode 100644 index 00000000..a3d7d10f --- /dev/null +++ b/bundles/jamopp.parser.jdt.singlefile/pom.xml @@ -0,0 +1,70 @@ + + + + 4.0.0 + jamopp.parser.jdt.singlefile + jar + JaMoPP JDT-based Parser for single files + + + tools.mdsd + jamopp.bundles + 6.0.0-SNAPSHOT + + + + + + org.apache.felix + maven-bundle-plugin + + + + bundle + + + + + + + + + + org.eclipse.emf + org.eclipse.emf.ecore + + + tools.mdsd + org.emftext.language.java + 6.0.0-SNAPSHOT + + + tools.mdsd + jamopp.parser + 6.0.0-SNAPSHOT + + + org.eclipse.jdt + org.eclipse.jdt.core + + + tools.mdsd + jamopp.resolution + 6.0.0-SNAPSHOT + + + org.apache.logging.log4j + log4j-1.2-api + + + org.apache.logging.log4j + log4j-api + + + org.apache.logging.log4j + log4j-core + + + diff --git a/bundles/jamopp.parser.jdt.singlefile/src/jamopp/parser/jdt/singlefile/AbstractAndEmptyModelJDTASTVisitorAndConverter.java b/bundles/jamopp.parser.jdt.singlefile/src/main/java/jamopp/parser/jdt/singlefile/AbstractAndEmptyModelJDTASTVisitorAndConverter.java similarity index 100% rename from bundles/jamopp.parser.jdt.singlefile/src/jamopp/parser/jdt/singlefile/AbstractAndEmptyModelJDTASTVisitorAndConverter.java rename to bundles/jamopp.parser.jdt.singlefile/src/main/java/jamopp/parser/jdt/singlefile/AbstractAndEmptyModelJDTASTVisitorAndConverter.java diff --git a/bundles/jamopp.parser.jdt.singlefile/src/jamopp/parser/jdt/singlefile/AnnotationInstanceOrModifierConverterUtility.java b/bundles/jamopp.parser.jdt.singlefile/src/main/java/jamopp/parser/jdt/singlefile/AnnotationInstanceOrModifierConverterUtility.java similarity index 100% rename from bundles/jamopp.parser.jdt.singlefile/src/jamopp/parser/jdt/singlefile/AnnotationInstanceOrModifierConverterUtility.java rename to bundles/jamopp.parser.jdt.singlefile/src/main/java/jamopp/parser/jdt/singlefile/AnnotationInstanceOrModifierConverterUtility.java diff --git a/bundles/jamopp.parser.jdt.singlefile/src/jamopp/parser/jdt/singlefile/BaseConverterUtility.java b/bundles/jamopp.parser.jdt.singlefile/src/main/java/jamopp/parser/jdt/singlefile/BaseConverterUtility.java similarity index 100% rename from bundles/jamopp.parser.jdt.singlefile/src/jamopp/parser/jdt/singlefile/BaseConverterUtility.java rename to bundles/jamopp.parser.jdt.singlefile/src/main/java/jamopp/parser/jdt/singlefile/BaseConverterUtility.java diff --git a/bundles/jamopp.parser.jdt.singlefile/src/jamopp/parser/jdt/singlefile/ClassifierConverterUtility.java b/bundles/jamopp.parser.jdt.singlefile/src/main/java/jamopp/parser/jdt/singlefile/ClassifierConverterUtility.java similarity index 100% rename from bundles/jamopp.parser.jdt.singlefile/src/jamopp/parser/jdt/singlefile/ClassifierConverterUtility.java rename to bundles/jamopp.parser.jdt.singlefile/src/main/java/jamopp/parser/jdt/singlefile/ClassifierConverterUtility.java diff --git a/bundles/jamopp.parser.jdt.singlefile/src/jamopp/parser/jdt/singlefile/ExpressionConverterUtility.java b/bundles/jamopp.parser.jdt.singlefile/src/main/java/jamopp/parser/jdt/singlefile/ExpressionConverterUtility.java similarity index 100% rename from bundles/jamopp.parser.jdt.singlefile/src/jamopp/parser/jdt/singlefile/ExpressionConverterUtility.java rename to bundles/jamopp.parser.jdt.singlefile/src/main/java/jamopp/parser/jdt/singlefile/ExpressionConverterUtility.java diff --git a/bundles/jamopp.parser.jdt.singlefile/src/jamopp/parser/jdt/singlefile/JaMoPPJDTSingleFileParser.java b/bundles/jamopp.parser.jdt.singlefile/src/main/java/jamopp/parser/jdt/singlefile/JaMoPPJDTSingleFileParser.java similarity index 100% rename from bundles/jamopp.parser.jdt.singlefile/src/jamopp/parser/jdt/singlefile/JaMoPPJDTSingleFileParser.java rename to bundles/jamopp.parser.jdt.singlefile/src/main/java/jamopp/parser/jdt/singlefile/JaMoPPJDTSingleFileParser.java diff --git a/bundles/jamopp.parser.jdt.singlefile/src/jamopp/parser/jdt/singlefile/LayoutInformationConverter.java b/bundles/jamopp.parser.jdt.singlefile/src/main/java/jamopp/parser/jdt/singlefile/LayoutInformationConverter.java similarity index 100% rename from bundles/jamopp.parser.jdt.singlefile/src/jamopp/parser/jdt/singlefile/LayoutInformationConverter.java rename to bundles/jamopp.parser.jdt.singlefile/src/main/java/jamopp/parser/jdt/singlefile/LayoutInformationConverter.java diff --git a/bundles/jamopp.parser.jdt.singlefile/src/jamopp/parser/jdt/singlefile/ModuleJDTASTVisitorAndConverter.java b/bundles/jamopp.parser.jdt.singlefile/src/main/java/jamopp/parser/jdt/singlefile/ModuleJDTASTVisitorAndConverter.java similarity index 100% rename from bundles/jamopp.parser.jdt.singlefile/src/jamopp/parser/jdt/singlefile/ModuleJDTASTVisitorAndConverter.java rename to bundles/jamopp.parser.jdt.singlefile/src/main/java/jamopp/parser/jdt/singlefile/ModuleJDTASTVisitorAndConverter.java diff --git a/bundles/jamopp.parser.jdt.singlefile/src/jamopp/parser/jdt/singlefile/NumberLiteralConverterUtility.java b/bundles/jamopp.parser.jdt.singlefile/src/main/java/jamopp/parser/jdt/singlefile/NumberLiteralConverterUtility.java similarity index 100% rename from bundles/jamopp.parser.jdt.singlefile/src/jamopp/parser/jdt/singlefile/NumberLiteralConverterUtility.java rename to bundles/jamopp.parser.jdt.singlefile/src/main/java/jamopp/parser/jdt/singlefile/NumberLiteralConverterUtility.java diff --git a/bundles/jamopp.parser.jdt.singlefile/src/jamopp/parser/jdt/singlefile/OrdinaryCompilationUnitJDTASTVisitorAndConverter.java b/bundles/jamopp.parser.jdt.singlefile/src/main/java/jamopp/parser/jdt/singlefile/OrdinaryCompilationUnitJDTASTVisitorAndConverter.java similarity index 100% rename from bundles/jamopp.parser.jdt.singlefile/src/jamopp/parser/jdt/singlefile/OrdinaryCompilationUnitJDTASTVisitorAndConverter.java rename to bundles/jamopp.parser.jdt.singlefile/src/main/java/jamopp/parser/jdt/singlefile/OrdinaryCompilationUnitJDTASTVisitorAndConverter.java diff --git a/bundles/jamopp.parser.jdt.singlefile/src/jamopp/parser/jdt/singlefile/PackageJDTASTVisitorAndConverter.java b/bundles/jamopp.parser.jdt.singlefile/src/main/java/jamopp/parser/jdt/singlefile/PackageJDTASTVisitorAndConverter.java similarity index 100% rename from bundles/jamopp.parser.jdt.singlefile/src/jamopp/parser/jdt/singlefile/PackageJDTASTVisitorAndConverter.java rename to bundles/jamopp.parser.jdt.singlefile/src/main/java/jamopp/parser/jdt/singlefile/PackageJDTASTVisitorAndConverter.java diff --git a/bundles/jamopp.parser.jdt.singlefile/src/jamopp/parser/jdt/singlefile/ParsePostProcessor.java b/bundles/jamopp.parser.jdt.singlefile/src/main/java/jamopp/parser/jdt/singlefile/ParsePostProcessor.java similarity index 100% rename from bundles/jamopp.parser.jdt.singlefile/src/jamopp/parser/jdt/singlefile/ParsePostProcessor.java rename to bundles/jamopp.parser.jdt.singlefile/src/main/java/jamopp/parser/jdt/singlefile/ParsePostProcessor.java diff --git a/bundles/jamopp.parser.jdt.singlefile/src/jamopp/parser/jdt/singlefile/ReferenceConverterUtility.java b/bundles/jamopp.parser.jdt.singlefile/src/main/java/jamopp/parser/jdt/singlefile/ReferenceConverterUtility.java similarity index 100% rename from bundles/jamopp.parser.jdt.singlefile/src/jamopp/parser/jdt/singlefile/ReferenceConverterUtility.java rename to bundles/jamopp.parser.jdt.singlefile/src/main/java/jamopp/parser/jdt/singlefile/ReferenceConverterUtility.java diff --git a/bundles/jamopp.parser.jdt.singlefile/src/jamopp/parser/jdt/singlefile/StatementConverterUtility.java b/bundles/jamopp.parser.jdt.singlefile/src/main/java/jamopp/parser/jdt/singlefile/StatementConverterUtility.java similarity index 100% rename from bundles/jamopp.parser.jdt.singlefile/src/jamopp/parser/jdt/singlefile/StatementConverterUtility.java rename to bundles/jamopp.parser.jdt.singlefile/src/main/java/jamopp/parser/jdt/singlefile/StatementConverterUtility.java diff --git a/bundles/jamopp.parser.jdt.singlefile/src/jamopp/parser/jdt/singlefile/package-info.java b/bundles/jamopp.parser.jdt.singlefile/src/main/java/jamopp/parser/jdt/singlefile/package-info.java similarity index 100% rename from bundles/jamopp.parser.jdt.singlefile/src/jamopp/parser/jdt/singlefile/package-info.java rename to bundles/jamopp.parser.jdt.singlefile/src/main/java/jamopp/parser/jdt/singlefile/package-info.java diff --git a/bundles/jamopp.parser.jdt/.classpath b/bundles/jamopp.parser.jdt/.classpath deleted file mode 100644 index 1a821310..00000000 --- a/bundles/jamopp.parser.jdt/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/bundles/jamopp.parser.jdt/.project b/bundles/jamopp.parser.jdt/.project deleted file mode 100644 index 7393e203..00000000 --- a/bundles/jamopp.parser.jdt/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - jamopp.parser.jdt - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - net.sf.eclipsecs.core.CheckstyleBuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.pde.PluginNature - net.sf.eclipsecs.core.CheckstyleNature - - diff --git a/bundles/jamopp.parser.jdt/META-INF/MANIFEST.MF b/bundles/jamopp.parser.jdt/META-INF/MANIFEST.MF deleted file mode 100644 index 9bc830f6..00000000 --- a/bundles/jamopp.parser.jdt/META-INF/MANIFEST.MF +++ /dev/null @@ -1,14 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: JaMoPP JDT-based Parser -Bundle-SymbolicName: jamopp.parser.jdt -Bundle-Version: 5.1.0.qualifier -Bundle-Vendor: Martin Armbruster -Automatic-Module-Name: jamopp.parser.jdt -Bundle-RequiredExecutionEnvironment: JavaSE-17 -Require-Bundle: org.eclipse.jdt.core, - org.eclipse.core.runtime, - org.emftext.language.java, - org.eclipse.emf.ecore, - jamopp.parser -Export-Package: jamopp.parser.jdt diff --git a/bundles/jamopp.parser.jdt/build.properties b/bundles/jamopp.parser.jdt/build.properties deleted file mode 100644 index 34d2e4d2..00000000 --- a/bundles/jamopp.parser.jdt/build.properties +++ /dev/null @@ -1,4 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - . diff --git a/bundles/jamopp.parser.jdt/pom.xml b/bundles/jamopp.parser.jdt/pom.xml new file mode 100644 index 00000000..09842a61 --- /dev/null +++ b/bundles/jamopp.parser.jdt/pom.xml @@ -0,0 +1,53 @@ + + + + 4.0.0 + jamopp.parser.jdt + jar + JaMoPP JDT-based Parser + + + tools.mdsd + jamopp.bundles + 6.0.0-SNAPSHOT + + + + + + org.apache.felix + maven-bundle-plugin + + + + bundle + + + + + + + + + + org.eclipse.emf + org.eclipse.emf.ecore + + + tools.mdsd + org.emftext.language.java + 6.0.0-SNAPSHOT + + + tools.mdsd + jamopp.parser + 6.0.0-SNAPSHOT + + + org.eclipse.jdt + org.eclipse.jdt.core + + + diff --git a/bundles/jamopp.parser.jdt/src/jamopp/parser/jdt/AbstractAndEmptyModelJDTASTVisitorAndConverter.java b/bundles/jamopp.parser.jdt/src/main/java/jamopp/parser/jdt/AbstractAndEmptyModelJDTASTVisitorAndConverter.java similarity index 100% rename from bundles/jamopp.parser.jdt/src/jamopp/parser/jdt/AbstractAndEmptyModelJDTASTVisitorAndConverter.java rename to bundles/jamopp.parser.jdt/src/main/java/jamopp/parser/jdt/AbstractAndEmptyModelJDTASTVisitorAndConverter.java diff --git a/bundles/jamopp.parser.jdt/src/jamopp/parser/jdt/AnnotationInstanceOrModifierConverterUtility.java b/bundles/jamopp.parser.jdt/src/main/java/jamopp/parser/jdt/AnnotationInstanceOrModifierConverterUtility.java similarity index 100% rename from bundles/jamopp.parser.jdt/src/jamopp/parser/jdt/AnnotationInstanceOrModifierConverterUtility.java rename to bundles/jamopp.parser.jdt/src/main/java/jamopp/parser/jdt/AnnotationInstanceOrModifierConverterUtility.java diff --git a/bundles/jamopp.parser.jdt/src/jamopp/parser/jdt/BaseConverterUtility.java b/bundles/jamopp.parser.jdt/src/main/java/jamopp/parser/jdt/BaseConverterUtility.java similarity index 100% rename from bundles/jamopp.parser.jdt/src/jamopp/parser/jdt/BaseConverterUtility.java rename to bundles/jamopp.parser.jdt/src/main/java/jamopp/parser/jdt/BaseConverterUtility.java diff --git a/bundles/jamopp.parser.jdt/src/jamopp/parser/jdt/ClassifierConverterUtility.java b/bundles/jamopp.parser.jdt/src/main/java/jamopp/parser/jdt/ClassifierConverterUtility.java similarity index 100% rename from bundles/jamopp.parser.jdt/src/jamopp/parser/jdt/ClassifierConverterUtility.java rename to bundles/jamopp.parser.jdt/src/main/java/jamopp/parser/jdt/ClassifierConverterUtility.java diff --git a/bundles/jamopp.parser.jdt/src/jamopp/parser/jdt/ExpressionConverterUtility.java b/bundles/jamopp.parser.jdt/src/main/java/jamopp/parser/jdt/ExpressionConverterUtility.java similarity index 100% rename from bundles/jamopp.parser.jdt/src/jamopp/parser/jdt/ExpressionConverterUtility.java rename to bundles/jamopp.parser.jdt/src/main/java/jamopp/parser/jdt/ExpressionConverterUtility.java diff --git a/bundles/jamopp.parser.jdt/src/jamopp/parser/jdt/JDTBindingConverterUtility.java b/bundles/jamopp.parser.jdt/src/main/java/jamopp/parser/jdt/JDTBindingConverterUtility.java similarity index 100% rename from bundles/jamopp.parser.jdt/src/jamopp/parser/jdt/JDTBindingConverterUtility.java rename to bundles/jamopp.parser.jdt/src/main/java/jamopp/parser/jdt/JDTBindingConverterUtility.java diff --git a/bundles/jamopp.parser.jdt/src/jamopp/parser/jdt/JDTResolverUtility.java b/bundles/jamopp.parser.jdt/src/main/java/jamopp/parser/jdt/JDTResolverUtility.java similarity index 100% rename from bundles/jamopp.parser.jdt/src/jamopp/parser/jdt/JDTResolverUtility.java rename to bundles/jamopp.parser.jdt/src/main/java/jamopp/parser/jdt/JDTResolverUtility.java diff --git a/bundles/jamopp.parser.jdt/src/jamopp/parser/jdt/JaMoPPJDTParser.java b/bundles/jamopp.parser.jdt/src/main/java/jamopp/parser/jdt/JaMoPPJDTParser.java similarity index 100% rename from bundles/jamopp.parser.jdt/src/jamopp/parser/jdt/JaMoPPJDTParser.java rename to bundles/jamopp.parser.jdt/src/main/java/jamopp/parser/jdt/JaMoPPJDTParser.java diff --git a/bundles/jamopp.parser.jdt/src/jamopp/parser/jdt/LayoutInformationConverter.java b/bundles/jamopp.parser.jdt/src/main/java/jamopp/parser/jdt/LayoutInformationConverter.java similarity index 100% rename from bundles/jamopp.parser.jdt/src/jamopp/parser/jdt/LayoutInformationConverter.java rename to bundles/jamopp.parser.jdt/src/main/java/jamopp/parser/jdt/LayoutInformationConverter.java diff --git a/bundles/jamopp.parser.jdt/src/jamopp/parser/jdt/ModuleJDTASTVisitorAndConverter.java b/bundles/jamopp.parser.jdt/src/main/java/jamopp/parser/jdt/ModuleJDTASTVisitorAndConverter.java similarity index 100% rename from bundles/jamopp.parser.jdt/src/jamopp/parser/jdt/ModuleJDTASTVisitorAndConverter.java rename to bundles/jamopp.parser.jdt/src/main/java/jamopp/parser/jdt/ModuleJDTASTVisitorAndConverter.java diff --git a/bundles/jamopp.parser.jdt/src/jamopp/parser/jdt/NumberLiteralConverterUtility.java b/bundles/jamopp.parser.jdt/src/main/java/jamopp/parser/jdt/NumberLiteralConverterUtility.java similarity index 100% rename from bundles/jamopp.parser.jdt/src/jamopp/parser/jdt/NumberLiteralConverterUtility.java rename to bundles/jamopp.parser.jdt/src/main/java/jamopp/parser/jdt/NumberLiteralConverterUtility.java diff --git a/bundles/jamopp.parser.jdt/src/jamopp/parser/jdt/OrdinaryCompilationUnitJDTASTVisitorAndConverter.java b/bundles/jamopp.parser.jdt/src/main/java/jamopp/parser/jdt/OrdinaryCompilationUnitJDTASTVisitorAndConverter.java similarity index 100% rename from bundles/jamopp.parser.jdt/src/jamopp/parser/jdt/OrdinaryCompilationUnitJDTASTVisitorAndConverter.java rename to bundles/jamopp.parser.jdt/src/main/java/jamopp/parser/jdt/OrdinaryCompilationUnitJDTASTVisitorAndConverter.java diff --git a/bundles/jamopp.parser.jdt/src/jamopp/parser/jdt/PackageJDTASTVisitorAndConverter.java b/bundles/jamopp.parser.jdt/src/main/java/jamopp/parser/jdt/PackageJDTASTVisitorAndConverter.java similarity index 100% rename from bundles/jamopp.parser.jdt/src/jamopp/parser/jdt/PackageJDTASTVisitorAndConverter.java rename to bundles/jamopp.parser.jdt/src/main/java/jamopp/parser/jdt/PackageJDTASTVisitorAndConverter.java diff --git a/bundles/jamopp.parser.jdt/src/jamopp/parser/jdt/ReferenceConverterUtility.java b/bundles/jamopp.parser.jdt/src/main/java/jamopp/parser/jdt/ReferenceConverterUtility.java similarity index 100% rename from bundles/jamopp.parser.jdt/src/jamopp/parser/jdt/ReferenceConverterUtility.java rename to bundles/jamopp.parser.jdt/src/main/java/jamopp/parser/jdt/ReferenceConverterUtility.java diff --git a/bundles/jamopp.parser.jdt/src/jamopp/parser/jdt/StatementConverterUtility.java b/bundles/jamopp.parser.jdt/src/main/java/jamopp/parser/jdt/StatementConverterUtility.java similarity index 100% rename from bundles/jamopp.parser.jdt/src/jamopp/parser/jdt/StatementConverterUtility.java rename to bundles/jamopp.parser.jdt/src/main/java/jamopp/parser/jdt/StatementConverterUtility.java diff --git a/bundles/jamopp.parser.jdt/src/jamopp/parser/jdt/TypeInstructionSeparationUtility.java b/bundles/jamopp.parser.jdt/src/main/java/jamopp/parser/jdt/TypeInstructionSeparationUtility.java similarity index 100% rename from bundles/jamopp.parser.jdt/src/jamopp/parser/jdt/TypeInstructionSeparationUtility.java rename to bundles/jamopp.parser.jdt/src/main/java/jamopp/parser/jdt/TypeInstructionSeparationUtility.java diff --git a/bundles/jamopp.parser/.classpath b/bundles/jamopp.parser/.classpath deleted file mode 100644 index 06bb5d7d..00000000 --- a/bundles/jamopp.parser/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/bundles/jamopp.parser/.project b/bundles/jamopp.parser/.project deleted file mode 100644 index 45e31165..00000000 --- a/bundles/jamopp.parser/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - jamopp.parser - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - net.sf.eclipsecs.core.CheckstyleBuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.pde.PluginNature - net.sf.eclipsecs.core.CheckstyleNature - - diff --git a/bundles/jamopp.parser/META-INF/MANIFEST.MF b/bundles/jamopp.parser/META-INF/MANIFEST.MF deleted file mode 100644 index 2ac3d86d..00000000 --- a/bundles/jamopp.parser/META-INF/MANIFEST.MF +++ /dev/null @@ -1,12 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: JaMoPP Parser API -Bundle-SymbolicName: jamopp.parser -Bundle-Version: 5.1.0.qualifier -Bundle-Vendor: Martin Armbruster -Automatic-Module-Name: jamopp.parser -Bundle-RequiredExecutionEnvironment: JavaSE-17 -Export-Package: jamopp.parser.api -Require-Bundle: org.emftext.language.java, - org.eclipse.emf.common, - org.eclipse.emf.ecore diff --git a/bundles/jamopp.parser/build.properties b/bundles/jamopp.parser/build.properties deleted file mode 100644 index 34d2e4d2..00000000 --- a/bundles/jamopp.parser/build.properties +++ /dev/null @@ -1,4 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - . diff --git a/bundles/jamopp.parser/pom.xml b/bundles/jamopp.parser/pom.xml new file mode 100644 index 00000000..49c66f8e --- /dev/null +++ b/bundles/jamopp.parser/pom.xml @@ -0,0 +1,44 @@ + + + + 4.0.0 + jamopp.parser + jar + JaMoPP Parser API + + + tools.mdsd + jamopp.bundles + 6.0.0-SNAPSHOT + + + + + + org.apache.felix + maven-bundle-plugin + + + + bundle + + + + + + + + + + org.eclipse.emf + org.eclipse.emf.ecore + + + tools.mdsd + org.emftext.language.java + 6.0.0-SNAPSHOT + + + diff --git a/bundles/jamopp.parser/src/jamopp/parser/api/JaMoPPParserAPI.java b/bundles/jamopp.parser/src/main/java/jamopp/parser/api/JaMoPPParserAPI.java similarity index 100% rename from bundles/jamopp.parser/src/jamopp/parser/api/JaMoPPParserAPI.java rename to bundles/jamopp.parser/src/main/java/jamopp/parser/api/JaMoPPParserAPI.java diff --git a/bundles/jamopp.parser/src/jamopp/parser/api/package-info.java b/bundles/jamopp.parser/src/main/java/jamopp/parser/api/package-info.java similarity index 100% rename from bundles/jamopp.parser/src/jamopp/parser/api/package-info.java rename to bundles/jamopp.parser/src/main/java/jamopp/parser/api/package-info.java diff --git a/bundles/jamopp.printer/.classpath b/bundles/jamopp.printer/.classpath deleted file mode 100644 index 1a821310..00000000 --- a/bundles/jamopp.printer/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/bundles/jamopp.printer/.project b/bundles/jamopp.printer/.project deleted file mode 100644 index 8c1d8973..00000000 --- a/bundles/jamopp.printer/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - jamopp.printer - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - net.sf.eclipsecs.core.CheckstyleBuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.pde.PluginNature - net.sf.eclipsecs.core.CheckstyleNature - - diff --git a/bundles/jamopp.printer/META-INF/MANIFEST.MF b/bundles/jamopp.printer/META-INF/MANIFEST.MF deleted file mode 100644 index b66e0250..00000000 --- a/bundles/jamopp.printer/META-INF/MANIFEST.MF +++ /dev/null @@ -1,11 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: JaMoPP Printer -Bundle-SymbolicName: jamopp.printer -Bundle-Version: 5.1.0.qualifier -Automatic-Module-Name: jamopp.printer -Bundle-RequiredExecutionEnvironment: JavaSE-17 -Bundle-Vendor: Martin Armbruster -Require-Bundle: org.emftext.language.java, - org.eclipse.emf.ecore -Export-Package: jamopp.printer diff --git a/bundles/jamopp.printer/build.properties b/bundles/jamopp.printer/build.properties deleted file mode 100644 index 34d2e4d2..00000000 --- a/bundles/jamopp.printer/build.properties +++ /dev/null @@ -1,4 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - . diff --git a/bundles/jamopp.printer/pom.xml b/bundles/jamopp.printer/pom.xml new file mode 100644 index 00000000..3c522fd2 --- /dev/null +++ b/bundles/jamopp.printer/pom.xml @@ -0,0 +1,44 @@ + + + + 4.0.0 + jamopp.printer + jar + JaMoPP Printer + + + tools.mdsd + jamopp.bundles + 6.0.0-SNAPSHOT + + + + + + org.apache.felix + maven-bundle-plugin + + + + bundle + + + + + + + + + + org.eclipse.emf + org.eclipse.emf.ecore + + + tools.mdsd + org.emftext.language.java + 6.0.0-SNAPSHOT + + + diff --git a/bundles/jamopp.printer/src/jamopp/printer/AnnotationsPrinterSwitch.java b/bundles/jamopp.printer/src/main/java/jamopp/printer/AnnotationsPrinterSwitch.java similarity index 100% rename from bundles/jamopp.printer/src/jamopp/printer/AnnotationsPrinterSwitch.java rename to bundles/jamopp.printer/src/main/java/jamopp/printer/AnnotationsPrinterSwitch.java diff --git a/bundles/jamopp.printer/src/jamopp/printer/ArraysPrinterSwitch.java b/bundles/jamopp.printer/src/main/java/jamopp/printer/ArraysPrinterSwitch.java similarity index 100% rename from bundles/jamopp.printer/src/jamopp/printer/ArraysPrinterSwitch.java rename to bundles/jamopp.printer/src/main/java/jamopp/printer/ArraysPrinterSwitch.java diff --git a/bundles/jamopp.printer/src/jamopp/printer/ClassifiersPrinterSwitch.java b/bundles/jamopp.printer/src/main/java/jamopp/printer/ClassifiersPrinterSwitch.java similarity index 100% rename from bundles/jamopp.printer/src/jamopp/printer/ClassifiersPrinterSwitch.java rename to bundles/jamopp.printer/src/main/java/jamopp/printer/ClassifiersPrinterSwitch.java diff --git a/bundles/jamopp.printer/src/jamopp/printer/ComposedParentPrinterSwitch.java b/bundles/jamopp.printer/src/main/java/jamopp/printer/ComposedParentPrinterSwitch.java similarity index 100% rename from bundles/jamopp.printer/src/jamopp/printer/ComposedParentPrinterSwitch.java rename to bundles/jamopp.printer/src/main/java/jamopp/printer/ComposedParentPrinterSwitch.java diff --git a/bundles/jamopp.printer/src/jamopp/printer/ContainersPrinterSwitch.java b/bundles/jamopp.printer/src/main/java/jamopp/printer/ContainersPrinterSwitch.java similarity index 100% rename from bundles/jamopp.printer/src/jamopp/printer/ContainersPrinterSwitch.java rename to bundles/jamopp.printer/src/main/java/jamopp/printer/ContainersPrinterSwitch.java diff --git a/bundles/jamopp.printer/src/jamopp/printer/ExpressionsPrinterSwitch.java b/bundles/jamopp.printer/src/main/java/jamopp/printer/ExpressionsPrinterSwitch.java similarity index 100% rename from bundles/jamopp.printer/src/jamopp/printer/ExpressionsPrinterSwitch.java rename to bundles/jamopp.printer/src/main/java/jamopp/printer/ExpressionsPrinterSwitch.java diff --git a/bundles/jamopp.printer/src/jamopp/printer/GenericsPrinterSwitch.java b/bundles/jamopp.printer/src/main/java/jamopp/printer/GenericsPrinterSwitch.java similarity index 100% rename from bundles/jamopp.printer/src/jamopp/printer/GenericsPrinterSwitch.java rename to bundles/jamopp.printer/src/main/java/jamopp/printer/GenericsPrinterSwitch.java diff --git a/bundles/jamopp.printer/src/jamopp/printer/ImportsPrinterSwitch.java b/bundles/jamopp.printer/src/main/java/jamopp/printer/ImportsPrinterSwitch.java similarity index 100% rename from bundles/jamopp.printer/src/jamopp/printer/ImportsPrinterSwitch.java rename to bundles/jamopp.printer/src/main/java/jamopp/printer/ImportsPrinterSwitch.java diff --git a/bundles/jamopp.printer/src/jamopp/printer/InstantiationsPrinterSwitch.java b/bundles/jamopp.printer/src/main/java/jamopp/printer/InstantiationsPrinterSwitch.java similarity index 100% rename from bundles/jamopp.printer/src/jamopp/printer/InstantiationsPrinterSwitch.java rename to bundles/jamopp.printer/src/main/java/jamopp/printer/InstantiationsPrinterSwitch.java diff --git a/bundles/jamopp.printer/src/jamopp/printer/JaMoPPPrinter.java b/bundles/jamopp.printer/src/main/java/jamopp/printer/JaMoPPPrinter.java similarity index 100% rename from bundles/jamopp.printer/src/jamopp/printer/JaMoPPPrinter.java rename to bundles/jamopp.printer/src/main/java/jamopp/printer/JaMoPPPrinter.java diff --git a/bundles/jamopp.printer/src/jamopp/printer/LiteralsPrinterSwitch.java b/bundles/jamopp.printer/src/main/java/jamopp/printer/LiteralsPrinterSwitch.java similarity index 100% rename from bundles/jamopp.printer/src/jamopp/printer/LiteralsPrinterSwitch.java rename to bundles/jamopp.printer/src/main/java/jamopp/printer/LiteralsPrinterSwitch.java diff --git a/bundles/jamopp.printer/src/jamopp/printer/MembersPrinterSwitch.java b/bundles/jamopp.printer/src/main/java/jamopp/printer/MembersPrinterSwitch.java similarity index 100% rename from bundles/jamopp.printer/src/jamopp/printer/MembersPrinterSwitch.java rename to bundles/jamopp.printer/src/main/java/jamopp/printer/MembersPrinterSwitch.java diff --git a/bundles/jamopp.printer/src/jamopp/printer/ModifiersPrinterSwitch.java b/bundles/jamopp.printer/src/main/java/jamopp/printer/ModifiersPrinterSwitch.java similarity index 100% rename from bundles/jamopp.printer/src/jamopp/printer/ModifiersPrinterSwitch.java rename to bundles/jamopp.printer/src/main/java/jamopp/printer/ModifiersPrinterSwitch.java diff --git a/bundles/jamopp.printer/src/jamopp/printer/ModulesPrinterSwitch.java b/bundles/jamopp.printer/src/main/java/jamopp/printer/ModulesPrinterSwitch.java similarity index 100% rename from bundles/jamopp.printer/src/jamopp/printer/ModulesPrinterSwitch.java rename to bundles/jamopp.printer/src/main/java/jamopp/printer/ModulesPrinterSwitch.java diff --git a/bundles/jamopp.printer/src/jamopp/printer/OperatorsPrinterSwitch.java b/bundles/jamopp.printer/src/main/java/jamopp/printer/OperatorsPrinterSwitch.java similarity index 100% rename from bundles/jamopp.printer/src/jamopp/printer/OperatorsPrinterSwitch.java rename to bundles/jamopp.printer/src/main/java/jamopp/printer/OperatorsPrinterSwitch.java diff --git a/bundles/jamopp.printer/src/jamopp/printer/ParametersPrinterSwitch.java b/bundles/jamopp.printer/src/main/java/jamopp/printer/ParametersPrinterSwitch.java similarity index 100% rename from bundles/jamopp.printer/src/jamopp/printer/ParametersPrinterSwitch.java rename to bundles/jamopp.printer/src/main/java/jamopp/printer/ParametersPrinterSwitch.java diff --git a/bundles/jamopp.printer/src/jamopp/printer/ReferencesPrinterSwitch.java b/bundles/jamopp.printer/src/main/java/jamopp/printer/ReferencesPrinterSwitch.java similarity index 100% rename from bundles/jamopp.printer/src/jamopp/printer/ReferencesPrinterSwitch.java rename to bundles/jamopp.printer/src/main/java/jamopp/printer/ReferencesPrinterSwitch.java diff --git a/bundles/jamopp.printer/src/jamopp/printer/StatementsPrinterSwitch.java b/bundles/jamopp.printer/src/main/java/jamopp/printer/StatementsPrinterSwitch.java similarity index 100% rename from bundles/jamopp.printer/src/jamopp/printer/StatementsPrinterSwitch.java rename to bundles/jamopp.printer/src/main/java/jamopp/printer/StatementsPrinterSwitch.java diff --git a/bundles/jamopp.printer/src/jamopp/printer/TypesPrinterSwitch.java b/bundles/jamopp.printer/src/main/java/jamopp/printer/TypesPrinterSwitch.java similarity index 100% rename from bundles/jamopp.printer/src/jamopp/printer/TypesPrinterSwitch.java rename to bundles/jamopp.printer/src/main/java/jamopp/printer/TypesPrinterSwitch.java diff --git a/bundles/jamopp.printer/src/jamopp/printer/VariablesPrinterSwitch.java b/bundles/jamopp.printer/src/main/java/jamopp/printer/VariablesPrinterSwitch.java similarity index 100% rename from bundles/jamopp.printer/src/jamopp/printer/VariablesPrinterSwitch.java rename to bundles/jamopp.printer/src/main/java/jamopp/printer/VariablesPrinterSwitch.java diff --git a/bundles/jamopp.printer/src/jamopp/printer/package-info.java b/bundles/jamopp.printer/src/main/java/jamopp/printer/package-info.java similarity index 100% rename from bundles/jamopp.printer/src/jamopp/printer/package-info.java rename to bundles/jamopp.printer/src/main/java/jamopp/printer/package-info.java diff --git a/bundles/jamopp.resolution/.checkstyle b/bundles/jamopp.resolution/.checkstyle deleted file mode 100644 index 1845d588..00000000 --- a/bundles/jamopp.resolution/.checkstyle +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/bundles/jamopp.resolution/.classpath b/bundles/jamopp.resolution/.classpath deleted file mode 100644 index 1a821310..00000000 --- a/bundles/jamopp.resolution/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/bundles/jamopp.resolution/.project b/bundles/jamopp.resolution/.project deleted file mode 100644 index 3b84ec2a..00000000 --- a/bundles/jamopp.resolution/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - jamopp.resolution - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - net.sf.eclipsecs.core.CheckstyleBuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.pde.PluginNature - net.sf.eclipsecs.core.CheckstyleNature - - diff --git a/bundles/jamopp.resolution/META-INF/MANIFEST.MF b/bundles/jamopp.resolution/META-INF/MANIFEST.MF deleted file mode 100644 index a158b2ae..00000000 --- a/bundles/jamopp.resolution/META-INF/MANIFEST.MF +++ /dev/null @@ -1,17 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: JaMoPP Reference Resolvers -Bundle-SymbolicName: jamopp.resolution -Bundle-Version: 5.1.0.qualifier -Bundle-Vendor: Martin Armbruster -Automatic-Module-Name: jamopp.resolution -Bundle-RequiredExecutionEnvironment: JavaSE-17 -Require-Bundle: org.eclipse.emf.ecore, - org.emftext.language.java, - org.eclipse.jdt.core -Export-Package: jamopp.proxy, - jamopp.recovery.trivial, - jamopp.resolution.bindings, - jamopp.resolution.util, - org.emftext.language.java.resolver, - org.emftext.language.java.resolver.result diff --git a/bundles/jamopp.resolution/build.properties b/bundles/jamopp.resolution/build.properties deleted file mode 100644 index 34d2e4d2..00000000 --- a/bundles/jamopp.resolution/build.properties +++ /dev/null @@ -1,4 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - . diff --git a/bundles/jamopp.resolution/pom.xml b/bundles/jamopp.resolution/pom.xml new file mode 100644 index 00000000..4bd91243 --- /dev/null +++ b/bundles/jamopp.resolution/pom.xml @@ -0,0 +1,48 @@ + + + + 4.0.0 + jamopp.resolution + jar + JaMoPP Reference Resolvers + + + tools.mdsd + jamopp.bundles + 6.0.0-SNAPSHOT + + + + + + org.apache.felix + maven-bundle-plugin + + + + bundle + + + + + + + + + + org.eclipse.emf + org.eclipse.emf.ecore + + + tools.mdsd + org.emftext.language.java + 6.0.0-SNAPSHOT + + + org.eclipse.jdt + org.eclipse.jdt.core + + + diff --git a/bundles/jamopp.resolution/src/jamopp/proxy/IJavaContextDependentURIFragment.java b/bundles/jamopp.resolution/src/main/java/jamopp/proxy/IJavaContextDependentURIFragment.java similarity index 100% rename from bundles/jamopp.resolution/src/jamopp/proxy/IJavaContextDependentURIFragment.java rename to bundles/jamopp.resolution/src/main/java/jamopp/proxy/IJavaContextDependentURIFragment.java diff --git a/bundles/jamopp.resolution/src/jamopp/proxy/IJavaContextDependentURIFragmentCollector.java b/bundles/jamopp.resolution/src/main/java/jamopp/proxy/IJavaContextDependentURIFragmentCollector.java similarity index 100% rename from bundles/jamopp.resolution/src/jamopp/proxy/IJavaContextDependentURIFragmentCollector.java rename to bundles/jamopp.resolution/src/main/java/jamopp/proxy/IJavaContextDependentURIFragmentCollector.java diff --git a/bundles/jamopp.resolution/src/jamopp/proxy/JavaContextDependentURIFragment.java b/bundles/jamopp.resolution/src/main/java/jamopp/proxy/JavaContextDependentURIFragment.java similarity index 100% rename from bundles/jamopp.resolution/src/jamopp/proxy/JavaContextDependentURIFragment.java rename to bundles/jamopp.resolution/src/main/java/jamopp/proxy/JavaContextDependentURIFragment.java diff --git a/bundles/jamopp.resolution/src/jamopp/proxy/package-info.java b/bundles/jamopp.resolution/src/main/java/jamopp/proxy/package-info.java similarity index 100% rename from bundles/jamopp.resolution/src/jamopp/proxy/package-info.java rename to bundles/jamopp.resolution/src/main/java/jamopp/proxy/package-info.java diff --git a/bundles/jamopp.resolution/src/jamopp/recovery/trivial/TrivialRecovery.java b/bundles/jamopp.resolution/src/main/java/jamopp/recovery/trivial/TrivialRecovery.java similarity index 100% rename from bundles/jamopp.resolution/src/jamopp/recovery/trivial/TrivialRecovery.java rename to bundles/jamopp.resolution/src/main/java/jamopp/recovery/trivial/TrivialRecovery.java diff --git a/bundles/jamopp.resolution/src/jamopp/recovery/trivial/package-info.java b/bundles/jamopp.resolution/src/main/java/jamopp/recovery/trivial/package-info.java similarity index 100% rename from bundles/jamopp.resolution/src/jamopp/recovery/trivial/package-info.java rename to bundles/jamopp.resolution/src/main/java/jamopp/recovery/trivial/package-info.java diff --git a/bundles/jamopp.resolution/src/jamopp/resolution/bindings/AbstractBindingResolver.java b/bundles/jamopp.resolution/src/main/java/jamopp/resolution/bindings/AbstractBindingResolver.java similarity index 100% rename from bundles/jamopp.resolution/src/jamopp/resolution/bindings/AbstractBindingResolver.java rename to bundles/jamopp.resolution/src/main/java/jamopp/resolution/bindings/AbstractBindingResolver.java diff --git a/bundles/jamopp.resolution/src/jamopp/resolution/bindings/CentralBindingBasedResolver.java b/bundles/jamopp.resolution/src/main/java/jamopp/resolution/bindings/CentralBindingBasedResolver.java similarity index 100% rename from bundles/jamopp.resolution/src/jamopp/resolution/bindings/CentralBindingBasedResolver.java rename to bundles/jamopp.resolution/src/main/java/jamopp/resolution/bindings/CentralBindingBasedResolver.java diff --git a/bundles/jamopp.resolution/src/jamopp/resolution/bindings/IAnnotationBindingResolver.java b/bundles/jamopp.resolution/src/main/java/jamopp/resolution/bindings/IAnnotationBindingResolver.java similarity index 100% rename from bundles/jamopp.resolution/src/jamopp/resolution/bindings/IAnnotationBindingResolver.java rename to bundles/jamopp.resolution/src/main/java/jamopp/resolution/bindings/IAnnotationBindingResolver.java diff --git a/bundles/jamopp.resolution/src/jamopp/resolution/bindings/IMemberValuePairBindingResolver.java b/bundles/jamopp.resolution/src/main/java/jamopp/resolution/bindings/IMemberValuePairBindingResolver.java similarity index 100% rename from bundles/jamopp.resolution/src/jamopp/resolution/bindings/IMemberValuePairBindingResolver.java rename to bundles/jamopp.resolution/src/main/java/jamopp/resolution/bindings/IMemberValuePairBindingResolver.java diff --git a/bundles/jamopp.resolution/src/jamopp/resolution/bindings/IMethodBindingResolver.java b/bundles/jamopp.resolution/src/main/java/jamopp/resolution/bindings/IMethodBindingResolver.java similarity index 100% rename from bundles/jamopp.resolution/src/jamopp/resolution/bindings/IMethodBindingResolver.java rename to bundles/jamopp.resolution/src/main/java/jamopp/resolution/bindings/IMethodBindingResolver.java diff --git a/bundles/jamopp.resolution/src/jamopp/resolution/bindings/IModuleBindingResolver.java b/bundles/jamopp.resolution/src/main/java/jamopp/resolution/bindings/IModuleBindingResolver.java similarity index 100% rename from bundles/jamopp.resolution/src/jamopp/resolution/bindings/IModuleBindingResolver.java rename to bundles/jamopp.resolution/src/main/java/jamopp/resolution/bindings/IModuleBindingResolver.java diff --git a/bundles/jamopp.resolution/src/jamopp/resolution/bindings/IPackageBindingResolver.java b/bundles/jamopp.resolution/src/main/java/jamopp/resolution/bindings/IPackageBindingResolver.java similarity index 100% rename from bundles/jamopp.resolution/src/jamopp/resolution/bindings/IPackageBindingResolver.java rename to bundles/jamopp.resolution/src/main/java/jamopp/resolution/bindings/IPackageBindingResolver.java diff --git a/bundles/jamopp.resolution/src/jamopp/resolution/bindings/ITypeBindingResolver.java b/bundles/jamopp.resolution/src/main/java/jamopp/resolution/bindings/ITypeBindingResolver.java similarity index 100% rename from bundles/jamopp.resolution/src/jamopp/resolution/bindings/ITypeBindingResolver.java rename to bundles/jamopp.resolution/src/main/java/jamopp/resolution/bindings/ITypeBindingResolver.java diff --git a/bundles/jamopp.resolution/src/jamopp/resolution/bindings/IVariableBindingResolver.java b/bundles/jamopp.resolution/src/main/java/jamopp/resolution/bindings/IVariableBindingResolver.java similarity index 100% rename from bundles/jamopp.resolution/src/jamopp/resolution/bindings/IVariableBindingResolver.java rename to bundles/jamopp.resolution/src/main/java/jamopp/resolution/bindings/IVariableBindingResolver.java diff --git a/bundles/jamopp.resolution/src/jamopp/resolution/bindings/JDTBindingConverterUtility.java b/bundles/jamopp.resolution/src/main/java/jamopp/resolution/bindings/JDTBindingConverterUtility.java similarity index 100% rename from bundles/jamopp.resolution/src/jamopp/resolution/bindings/JDTBindingConverterUtility.java rename to bundles/jamopp.resolution/src/main/java/jamopp/resolution/bindings/JDTBindingConverterUtility.java diff --git a/bundles/jamopp.resolution/src/jamopp/resolution/bindings/package-info.java b/bundles/jamopp.resolution/src/main/java/jamopp/resolution/bindings/package-info.java similarity index 100% rename from bundles/jamopp.resolution/src/jamopp/resolution/bindings/package-info.java rename to bundles/jamopp.resolution/src/main/java/jamopp/resolution/bindings/package-info.java diff --git a/bundles/jamopp.resolution/src/jamopp/resolution/util/JavaInterruptibleEcoreResolver.java b/bundles/jamopp.resolution/src/main/java/jamopp/resolution/util/JavaInterruptibleEcoreResolver.java similarity index 100% rename from bundles/jamopp.resolution/src/jamopp/resolution/util/JavaInterruptibleEcoreResolver.java rename to bundles/jamopp.resolution/src/main/java/jamopp/resolution/util/JavaInterruptibleEcoreResolver.java diff --git a/bundles/jamopp.resolution/src/jamopp/resolution/util/package-info.java b/bundles/jamopp.resolution/src/main/java/jamopp/resolution/util/package-info.java similarity index 100% rename from bundles/jamopp.resolution/src/jamopp/resolution/util/package-info.java rename to bundles/jamopp.resolution/src/main/java/jamopp/resolution/util/package-info.java diff --git a/bundles/jamopp.resolution/src/org/emftext/language/java/resolver/AnnotationAttributeSettingAttributeReferenceResolver.java b/bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/AnnotationAttributeSettingAttributeReferenceResolver.java similarity index 100% rename from bundles/jamopp.resolution/src/org/emftext/language/java/resolver/AnnotationAttributeSettingAttributeReferenceResolver.java rename to bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/AnnotationAttributeSettingAttributeReferenceResolver.java diff --git a/bundles/jamopp.resolution/src/org/emftext/language/java/resolver/AnnotationInstanceAnnotationReferenceResolver.java b/bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/AnnotationInstanceAnnotationReferenceResolver.java similarity index 100% rename from bundles/jamopp.resolution/src/org/emftext/language/java/resolver/AnnotationInstanceAnnotationReferenceResolver.java rename to bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/AnnotationInstanceAnnotationReferenceResolver.java diff --git a/bundles/jamopp.resolution/src/org/emftext/language/java/resolver/CentralReferenceResolver.java b/bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/CentralReferenceResolver.java similarity index 95% rename from bundles/jamopp.resolution/src/org/emftext/language/java/resolver/CentralReferenceResolver.java rename to bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/CentralReferenceResolver.java index 360a4771..2a48e955 100644 --- a/bundles/jamopp.resolution/src/org/emftext/language/java/resolver/CentralReferenceResolver.java +++ b/bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/CentralReferenceResolver.java @@ -106,10 +106,11 @@ private void addResultToList(IJavaReferenceMapping mapping, E if (mapping instanceof IJavaElementMapping) { target = ((IJavaElementMapping) mapping).getTarget(); - } else if (mapping instanceof IJavaURIMapping) { - target = EcoreUtil.copy(proxy); - URI uri = ((IJavaURIMapping) mapping).getTarget(); - ((InternalEObject) target).eSetProxyURI(uri); + // TODO + // } else if (mapping instanceof IJavaURIMapping) { + // target = EcoreUtil.copy(proxy); + // URI uri = ((IJavaURIMapping) mapping).getTarget(); + // ((InternalEObject) target).eSetProxyURI(uri); } try { // If target is in another proxy and list is "unique", add() will try to resolve diff --git a/bundles/jamopp.resolution/src/org/emftext/language/java/resolver/ClassifierImportClassifierReferenceResolver.java b/bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/ClassifierImportClassifierReferenceResolver.java similarity index 100% rename from bundles/jamopp.resolution/src/org/emftext/language/java/resolver/ClassifierImportClassifierReferenceResolver.java rename to bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/ClassifierImportClassifierReferenceResolver.java diff --git a/bundles/jamopp.resolution/src/org/emftext/language/java/resolver/ClassifierReferenceTargetReferenceResolver.java b/bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/ClassifierReferenceTargetReferenceResolver.java similarity index 100% rename from bundles/jamopp.resolution/src/org/emftext/language/java/resolver/ClassifierReferenceTargetReferenceResolver.java rename to bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/ClassifierReferenceTargetReferenceResolver.java diff --git a/bundles/jamopp.resolution/src/org/emftext/language/java/resolver/ElementReferenceTargetReferenceResolver.java b/bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/ElementReferenceTargetReferenceResolver.java similarity index 100% rename from bundles/jamopp.resolution/src/org/emftext/language/java/resolver/ElementReferenceTargetReferenceResolver.java rename to bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/ElementReferenceTargetReferenceResolver.java diff --git a/bundles/jamopp.resolution/src/org/emftext/language/java/resolver/IJavaReferenceResolver.java b/bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/IJavaReferenceResolver.java similarity index 100% rename from bundles/jamopp.resolution/src/org/emftext/language/java/resolver/IJavaReferenceResolver.java rename to bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/IJavaReferenceResolver.java diff --git a/bundles/jamopp.resolution/src/org/emftext/language/java/resolver/JavaReferenceResolverSwitch.java b/bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/JavaReferenceResolverSwitch.java similarity index 100% rename from bundles/jamopp.resolution/src/org/emftext/language/java/resolver/JavaReferenceResolverSwitch.java rename to bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/JavaReferenceResolverSwitch.java diff --git a/bundles/jamopp.resolution/src/org/emftext/language/java/resolver/StaticMemberImportStaticMembersReferenceResolver.java b/bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/StaticMemberImportStaticMembersReferenceResolver.java similarity index 100% rename from bundles/jamopp.resolution/src/org/emftext/language/java/resolver/StaticMemberImportStaticMembersReferenceResolver.java rename to bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/StaticMemberImportStaticMembersReferenceResolver.java diff --git a/bundles/jamopp.resolution/src/org/emftext/language/java/resolver/decider/AbstractDecider.java b/bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/decider/AbstractDecider.java similarity index 100% rename from bundles/jamopp.resolution/src/org/emftext/language/java/resolver/decider/AbstractDecider.java rename to bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/decider/AbstractDecider.java diff --git a/bundles/jamopp.resolution/src/org/emftext/language/java/resolver/decider/ConcreteClassifierDecider.java b/bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/decider/ConcreteClassifierDecider.java similarity index 100% rename from bundles/jamopp.resolution/src/org/emftext/language/java/resolver/decider/ConcreteClassifierDecider.java rename to bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/decider/ConcreteClassifierDecider.java diff --git a/bundles/jamopp.resolution/src/org/emftext/language/java/resolver/decider/EnumConstantDecider.java b/bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/decider/EnumConstantDecider.java similarity index 100% rename from bundles/jamopp.resolution/src/org/emftext/language/java/resolver/decider/EnumConstantDecider.java rename to bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/decider/EnumConstantDecider.java diff --git a/bundles/jamopp.resolution/src/org/emftext/language/java/resolver/decider/FieldDecider.java b/bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/decider/FieldDecider.java similarity index 100% rename from bundles/jamopp.resolution/src/org/emftext/language/java/resolver/decider/FieldDecider.java rename to bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/decider/FieldDecider.java diff --git a/bundles/jamopp.resolution/src/org/emftext/language/java/resolver/decider/IResolutionTargetDecider.java b/bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/decider/IResolutionTargetDecider.java similarity index 100% rename from bundles/jamopp.resolution/src/org/emftext/language/java/resolver/decider/IResolutionTargetDecider.java rename to bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/decider/IResolutionTargetDecider.java diff --git a/bundles/jamopp.resolution/src/org/emftext/language/java/resolver/decider/InterfaceMethodDecider.java b/bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/decider/InterfaceMethodDecider.java similarity index 100% rename from bundles/jamopp.resolution/src/org/emftext/language/java/resolver/decider/InterfaceMethodDecider.java rename to bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/decider/InterfaceMethodDecider.java diff --git a/bundles/jamopp.resolution/src/org/emftext/language/java/resolver/decider/LocalVariableDecider.java b/bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/decider/LocalVariableDecider.java similarity index 100% rename from bundles/jamopp.resolution/src/org/emftext/language/java/resolver/decider/LocalVariableDecider.java rename to bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/decider/LocalVariableDecider.java diff --git a/bundles/jamopp.resolution/src/org/emftext/language/java/resolver/decider/MethodDecider.java b/bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/decider/MethodDecider.java similarity index 100% rename from bundles/jamopp.resolution/src/org/emftext/language/java/resolver/decider/MethodDecider.java rename to bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/decider/MethodDecider.java diff --git a/bundles/jamopp.resolution/src/org/emftext/language/java/resolver/decider/PackageDecider.java b/bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/decider/PackageDecider.java similarity index 100% rename from bundles/jamopp.resolution/src/org/emftext/language/java/resolver/decider/PackageDecider.java rename to bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/decider/PackageDecider.java diff --git a/bundles/jamopp.resolution/src/org/emftext/language/java/resolver/decider/ParameterDecider.java b/bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/decider/ParameterDecider.java similarity index 100% rename from bundles/jamopp.resolution/src/org/emftext/language/java/resolver/decider/ParameterDecider.java rename to bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/decider/ParameterDecider.java diff --git a/bundles/jamopp.resolution/src/org/emftext/language/java/resolver/decider/ScopedTreeWalker.java b/bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/decider/ScopedTreeWalker.java similarity index 100% rename from bundles/jamopp.resolution/src/org/emftext/language/java/resolver/decider/ScopedTreeWalker.java rename to bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/decider/ScopedTreeWalker.java diff --git a/bundles/jamopp.resolution/src/org/emftext/language/java/resolver/decider/TypeParameterDecider.java b/bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/decider/TypeParameterDecider.java similarity index 100% rename from bundles/jamopp.resolution/src/org/emftext/language/java/resolver/decider/TypeParameterDecider.java rename to bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/decider/TypeParameterDecider.java diff --git a/bundles/jamopp.resolution/src/org/emftext/language/java/resolver/decider/package-info.java b/bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/decider/package-info.java similarity index 100% rename from bundles/jamopp.resolution/src/org/emftext/language/java/resolver/decider/package-info.java rename to bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/decider/package-info.java diff --git a/bundles/jamopp.resolution/src/org/emftext/language/java/resolver/package-info.java b/bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/package-info.java similarity index 100% rename from bundles/jamopp.resolution/src/org/emftext/language/java/resolver/package-info.java rename to bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/package-info.java diff --git a/bundles/jamopp.resolution/src/org/emftext/language/java/resolver/result/AbstractBaseJavaReferenceMapping.java b/bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/result/AbstractBaseJavaReferenceMapping.java similarity index 100% rename from bundles/jamopp.resolution/src/org/emftext/language/java/resolver/result/AbstractBaseJavaReferenceMapping.java rename to bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/result/AbstractBaseJavaReferenceMapping.java diff --git a/bundles/jamopp.resolution/src/org/emftext/language/java/resolver/result/IJavaElementMapping.java b/bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/result/IJavaElementMapping.java similarity index 100% rename from bundles/jamopp.resolution/src/org/emftext/language/java/resolver/result/IJavaElementMapping.java rename to bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/result/IJavaElementMapping.java diff --git a/bundles/jamopp.resolution/src/org/emftext/language/java/resolver/result/IJavaReferenceMapping.java b/bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/result/IJavaReferenceMapping.java similarity index 100% rename from bundles/jamopp.resolution/src/org/emftext/language/java/resolver/result/IJavaReferenceMapping.java rename to bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/result/IJavaReferenceMapping.java diff --git a/bundles/jamopp.resolution/src/org/emftext/language/java/resolver/result/IJavaReferenceResolveResult.java b/bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/result/IJavaReferenceResolveResult.java similarity index 100% rename from bundles/jamopp.resolution/src/org/emftext/language/java/resolver/result/IJavaReferenceResolveResult.java rename to bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/result/IJavaReferenceResolveResult.java diff --git a/bundles/jamopp.resolution/src/org/emftext/language/java/resolver/result/IJavaURIMapping.java b/bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/result/IJavaURIMapping.java similarity index 100% rename from bundles/jamopp.resolution/src/org/emftext/language/java/resolver/result/IJavaURIMapping.java rename to bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/result/IJavaURIMapping.java diff --git a/bundles/jamopp.resolution/src/org/emftext/language/java/resolver/result/JavaDelegatingResolveResult.java b/bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/result/JavaDelegatingResolveResult.java similarity index 100% rename from bundles/jamopp.resolution/src/org/emftext/language/java/resolver/result/JavaDelegatingResolveResult.java rename to bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/result/JavaDelegatingResolveResult.java diff --git a/bundles/jamopp.resolution/src/org/emftext/language/java/resolver/result/JavaElementMapping.java b/bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/result/JavaElementMapping.java similarity index 100% rename from bundles/jamopp.resolution/src/org/emftext/language/java/resolver/result/JavaElementMapping.java rename to bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/result/JavaElementMapping.java diff --git a/bundles/jamopp.resolution/src/org/emftext/language/java/resolver/result/JavaReferenceResolveResult.java b/bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/result/JavaReferenceResolveResult.java similarity index 100% rename from bundles/jamopp.resolution/src/org/emftext/language/java/resolver/result/JavaReferenceResolveResult.java rename to bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/result/JavaReferenceResolveResult.java diff --git a/bundles/jamopp.resolution/src/org/emftext/language/java/resolver/result/JavaURIMapping.java b/bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/result/JavaURIMapping.java similarity index 100% rename from bundles/jamopp.resolution/src/org/emftext/language/java/resolver/result/JavaURIMapping.java rename to bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/result/JavaURIMapping.java diff --git a/bundles/jamopp.resolution/src/org/emftext/language/java/resolver/result/package-info.java b/bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/result/package-info.java similarity index 100% rename from bundles/jamopp.resolution/src/org/emftext/language/java/resolver/result/package-info.java rename to bundles/jamopp.resolution/src/main/java/org/emftext/language/java/resolver/result/package-info.java diff --git a/bundles/jamopp.resource/.classpath b/bundles/jamopp.resource/.classpath deleted file mode 100644 index 81fe078c..00000000 --- a/bundles/jamopp.resource/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/bundles/jamopp.resource/.project b/bundles/jamopp.resource/.project deleted file mode 100644 index d3407545..00000000 --- a/bundles/jamopp.resource/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - jamopp.resource - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - net.sf.eclipsecs.core.CheckstyleBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - net.sf.eclipsecs.core.CheckstyleNature - - diff --git a/bundles/jamopp.resource/META-INF/MANIFEST.MF b/bundles/jamopp.resource/META-INF/MANIFEST.MF deleted file mode 100644 index b70fc4c9..00000000 --- a/bundles/jamopp.resource/META-INF/MANIFEST.MF +++ /dev/null @@ -1,17 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: JaMoPP new Resource support -Bundle-SymbolicName: jamopp.resource -Bundle-Version: 5.1.0.qualifier -Bundle-Vendor: Martin Armbruster -Automatic-Module-Name: jamopp.resource -Bundle-RequiredExecutionEnvironment: JavaSE-17 -Bundle-ActivationPolicy: lazy -Require-Bundle: jamopp.printer, - org.emftext.language.java, - jamopp.resolution, - jamopp.parser.jdt.singlefile, - jamopp.parser.bcel, - org.apache.log4j, - org.eclipse.emf.ecore.xmi -Export-Package: jamopp.resource diff --git a/bundles/jamopp.resource/build.properties b/bundles/jamopp.resource/build.properties deleted file mode 100644 index 34d2e4d2..00000000 --- a/bundles/jamopp.resource/build.properties +++ /dev/null @@ -1,4 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - . diff --git a/bundles/jamopp.resource/pom.xml b/bundles/jamopp.resource/pom.xml new file mode 100644 index 00000000..879016f1 --- /dev/null +++ b/bundles/jamopp.resource/pom.xml @@ -0,0 +1,76 @@ + + + + 4.0.0 + jamopp.resource + jar + JaMoPP new Resource support + + + tools.mdsd + jamopp.bundles + 6.0.0-SNAPSHOT + + + + + + org.apache.felix + maven-bundle-plugin + + + + bundle + + + + + + + + + + org.eclipse.emf + org.eclipse.emf.ecore.xmi + + + tools.mdsd + org.emftext.language.java + 6.0.0-SNAPSHOT + + + tools.mdsd + jamopp.printer + 6.0.0-SNAPSHOT + + + tools.mdsd + jamopp.resolution + 6.0.0-SNAPSHOT + + + tools.mdsd + jamopp.parser.bcel + 6.0.0-SNAPSHOT + + + tools.mdsd + jamopp.parser.jdt.singlefile + 6.0.0-SNAPSHOT + + + org.apache.logging.log4j + log4j-1.2-api + + + org.apache.logging.log4j + log4j-api + + + org.apache.logging.log4j + log4j-core + + + diff --git a/bundles/jamopp.resource/src/jamopp/resource/JavaResource2.java b/bundles/jamopp.resource/src/main/java/jamopp/resource/JavaResource2.java similarity index 93% rename from bundles/jamopp.resource/src/jamopp/resource/JavaResource2.java rename to bundles/jamopp.resource/src/main/java/jamopp/resource/JavaResource2.java index 87c5276b..c899f682 100644 --- a/bundles/jamopp.resource/src/jamopp/resource/JavaResource2.java +++ b/bundles/jamopp.resource/src/main/java/jamopp/resource/JavaResource2.java @@ -199,28 +199,30 @@ protected EObject getEObject(List uriFragmentPath) { private EObject getResultElement(IJavaContextDependentURIFragment uriFragment, IJavaReferenceMapping mapping, EObject proxy, final String errorMessage) { - if (mapping instanceof IJavaURIMapping) { - URI uri = ((IJavaURIMapping) mapping).getTarget(); - if (uri != null) { - EObject result = null; - try { - result = this.getResourceSet().getEObject(uri, true); - } catch (Exception e) { - // We can catch exceptions here because EMF will try to resolve again and - // handles the exception. - } - if (result == null || result.eIsProxy()) { - // Unable to resolve: attach error. - if (errorMessage == null) { - assert false; - } else { - getErrors().add(new SimpleDiagnostic(errorMessage, proxy)); - } - } - return result; - } - return null; - } else if (mapping instanceof IJavaElementMapping) { + // TODO + // if (mapping instanceof IJavaURIMapping) { + // URI uri = ((IJavaURIMapping) mapping).getTarget(); + // if (uri != null) { + // EObject result = null; + // try { + // result = this.getResourceSet().getEObject(uri, true); + // } catch (Exception e) { + // // We can catch exceptions here because EMF will try to resolve again and + // // handles the exception. + // } + // if (result == null || result.eIsProxy()) { + // // Unable to resolve: attach error. + // if (errorMessage == null) { + // assert false; + // } else { + // getErrors().add(new SimpleDiagnostic(errorMessage, proxy)); + // } + // } + // return result; + // } + // return null; + // } else + if (mapping instanceof IJavaElementMapping) { EObject element = ((IJavaElementMapping) mapping).getTarget(); EReference reference = uriFragment.getReference(); EReference oppositeReference = uriFragment.getReference().getEOpposite(); diff --git a/bundles/jamopp.resource/src/jamopp/resource/JavaResource2Factory.java b/bundles/jamopp.resource/src/main/java/jamopp/resource/JavaResource2Factory.java similarity index 100% rename from bundles/jamopp.resource/src/jamopp/resource/JavaResource2Factory.java rename to bundles/jamopp.resource/src/main/java/jamopp/resource/JavaResource2Factory.java diff --git a/bundles/jamopp.resource/src/jamopp/resource/package-info.java b/bundles/jamopp.resource/src/main/java/jamopp/resource/package-info.java similarity index 100% rename from bundles/jamopp.resource/src/jamopp/resource/package-info.java rename to bundles/jamopp.resource/src/main/java/jamopp/resource/package-info.java diff --git a/bundles/jamopp.standalone/.classpath b/bundles/jamopp.standalone/.classpath deleted file mode 100644 index 06bb5d7d..00000000 --- a/bundles/jamopp.standalone/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/bundles/jamopp.standalone/.project b/bundles/jamopp.standalone/.project deleted file mode 100644 index e9137585..00000000 --- a/bundles/jamopp.standalone/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - jamopp.standalone - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.pde.PluginNature - - diff --git a/bundles/jamopp.standalone/META-INF/MANIFEST.MF b/bundles/jamopp.standalone/META-INF/MANIFEST.MF deleted file mode 100644 index ba9c1188..00000000 --- a/bundles/jamopp.standalone/META-INF/MANIFEST.MF +++ /dev/null @@ -1,14 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: JaMoPP Standalone -Bundle-SymbolicName: jamopp.standalone -Bundle-Version: 5.1.0.qualifier -Bundle-Vendor: Martin Armbruster -Automatic-Module-Name: jamopp.parser -Bundle-RequiredExecutionEnvironment: JavaSE-17 -Export-Package: jamopp.standalone -Require-Bundle: org.emftext.language.java, - jamopp.parser.jdt, - jamopp.parser, - jamopp.resource, - org.eclipse.emf.ecore.xmi diff --git a/bundles/jamopp.standalone/build.properties b/bundles/jamopp.standalone/build.properties deleted file mode 100644 index 34d2e4d2..00000000 --- a/bundles/jamopp.standalone/build.properties +++ /dev/null @@ -1,4 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - . diff --git a/bundles/jamopp.standalone/pom.xml b/bundles/jamopp.standalone/pom.xml new file mode 100644 index 00000000..7419fd0b --- /dev/null +++ b/bundles/jamopp.standalone/pom.xml @@ -0,0 +1,54 @@ + + + + 4.0.0 + jamopp.standalone + jar + JaMoPP Standalone + + + tools.mdsd + jamopp.bundles + 6.0.0-SNAPSHOT + + + + + + org.apache.felix + maven-bundle-plugin + + + + bundle + + + + + + + + + + tools.mdsd + org.emftext.language.java + 6.0.0-SNAPSHOT + + + tools.mdsd + jamopp.resource + 6.0.0-SNAPSHOT + + + tools.mdsd + jamopp.parser.jdt + 6.0.0-SNAPSHOT + + + org.eclipse.emf + org.eclipse.emf.ecore.xmi + + + diff --git a/bundles/jamopp.standalone/src/jamopp/standalone/JaMoPPStandalone.java b/bundles/jamopp.standalone/src/main/java/jamopp/standalone/JaMoPPStandalone.java similarity index 100% rename from bundles/jamopp.standalone/src/jamopp/standalone/JaMoPPStandalone.java rename to bundles/jamopp.standalone/src/main/java/jamopp/standalone/JaMoPPStandalone.java diff --git a/bundles/jamopp.standalone/src/jamopp/standalone/package-info.java b/bundles/jamopp.standalone/src/main/java/jamopp/standalone/package-info.java similarity index 100% rename from bundles/jamopp.standalone/src/jamopp/standalone/package-info.java rename to bundles/jamopp.standalone/src/main/java/jamopp/standalone/package-info.java diff --git a/bundles/org.emftext.language.java.edit/.classpath b/bundles/org.emftext.language.java.edit/.classpath deleted file mode 100644 index 2377d859..00000000 --- a/bundles/org.emftext.language.java.edit/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/bundles/org.emftext.language.java.edit/.gitignore b/bundles/org.emftext.language.java.edit/.gitignore new file mode 100644 index 00000000..7c1731c2 --- /dev/null +++ b/bundles/org.emftext.language.java.edit/.gitignore @@ -0,0 +1 @@ +/src/main/generated diff --git a/bundles/org.emftext.language.java.edit/.project b/bundles/org.emftext.language.java.edit/.project deleted file mode 100644 index 1dd3ee65..00000000 --- a/bundles/org.emftext.language.java.edit/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - org.emftext.language.java.edit - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - net.sf.eclipsecs.core.CheckstyleBuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.pde.PluginNature - net.sf.eclipsecs.core.CheckstyleNature - - diff --git a/bundles/org.emftext.language.java.edit/META-INF/MANIFEST.MF b/bundles/org.emftext.language.java.edit/META-INF/MANIFEST.MF deleted file mode 100644 index 2fe466bf..00000000 --- a/bundles/org.emftext.language.java.edit/META-INF/MANIFEST.MF +++ /dev/null @@ -1,37 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: JaMoPP (Java Model Parser and Printer) Metamodel Edit Sup - port -Bundle-SymbolicName: org.emftext.language.java.edit;singleton:=true -Automatic-Module-Name: org.emftext.language.java.edit -Bundle-Version: 5.1.0.qualifier -Bundle-ClassPath: . -Bundle-Activator: org.emftext.language.java.annotations.provider.JavaEditPlugin$Implementation -Bundle-Vendor: Martin Armbruster -Bundle-Localization: plugin -Export-Package: org.emftext.commons.layout.provider, - org.emftext.language.java.annotations.provider, - org.emftext.language.java.arrays.provider, - org.emftext.language.java.classifiers.provider, - org.emftext.language.java.commons.provider, - org.emftext.language.java.containers.provider, - org.emftext.language.java.expressions.provider, - org.emftext.language.java.generics.provider, - org.emftext.language.java.imports.provider, - org.emftext.language.java.instantiations.provider, - org.emftext.language.java.literals.provider, - org.emftext.language.java.members.provider, - org.emftext.language.java.modifiers.provider, - org.emftext.language.java.modules.provider, - org.emftext.language.java.operators.provider, - org.emftext.language.java.parameters.provider, - org.emftext.language.java.references.provider, - org.emftext.language.java.statements.provider, - org.emftext.language.java.types.provider, - org.emftext.language.java.variables.provider -Bundle-RequiredExecutionEnvironment: JavaSE-17 -Require-Bundle: org.eclipse.core.runtime, - org.emftext.language.java, - org.eclipse.emf.edit -Bundle-ActivationPolicy: lazy - diff --git a/bundles/org.emftext.language.java.edit/build.properties b/bundles/org.emftext.language.java.edit/build.properties deleted file mode 100644 index d85301d8..00000000 --- a/bundles/org.emftext.language.java.edit/build.properties +++ /dev/null @@ -1,14 +0,0 @@ - -# -# -# -# $Id$ - -bin.includes = .,\ - icons/,\ - META-INF/,\ - plugin.xml,\ - plugin.properties -jars.compile.order = . -source.. = src-gen/ -output.. = bin/ diff --git a/bundles/org.emftext.language.java.edit/pom.xml b/bundles/org.emftext.language.java.edit/pom.xml new file mode 100644 index 00000000..9630bdac --- /dev/null +++ b/bundles/org.emftext.language.java.edit/pom.xml @@ -0,0 +1,164 @@ + + + + 4.0.0 + org.emftext.language.java.edit + jar + JaMoPP (Java Model Parser and Printer) Metamodel Edit Support + + + tools.mdsd + jamopp.bundles + 6.0.0-SNAPSHOT + + + + + + org.apache.maven.plugins + maven-resources-plugin + + + mwe2CopyEditProperties + generate-sources + + copy-resources + + + + + ${project.basedir} + + plugin.properties + plugin.xml + + + + ${project.basedir}/src/main/resources + + + + mwe2CopyEditIcons + generate-sources + + copy-resources + + + + + ${project.basedir}/icons + + **/* + + + + ${project.basedir}/src/main/resources/icons + + + + + + org.apache.maven.plugins + maven-clean-plugin + + + mwe2Clean + generate-sources + + clean + + + true + + + ${project.basedir} + + plugin.xml + plugin.properties + build.properties + + + + ${project.basedir}/icons + + + + + + + + org.apache.felix + maven-bundle-plugin + + + + bundle + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + generate-sources + + add-source + + + + src/main/generated + + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.apache.maven.plugins + maven-clean-plugin + [3.1.0,) + + clean + + + + + + + + + + + + + + + + + org.eclipse.platform + org.eclipse.core.runtime + + + org.eclipse.emf + org.eclipse.emf.edit + + + tools.mdsd + org.emftext.language.java + 6.0.0-SNAPSHOT + + + diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAccessProvidingModuleDirective_modules_ModuleReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAccessProvidingModuleDirective_modules_ModuleReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAccessProvidingModuleDirective_modules_ModuleReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAccessProvidingModuleDirective_modules_ModuleReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_additiveOperators_Addition.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_additiveOperators_Addition.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_additiveOperators_Addition.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_additiveOperators_Addition.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_additiveOperators_Subtraction.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_additiveOperators_Subtraction.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_additiveOperators_Subtraction.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_additiveOperators_Subtraction.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_ArrayConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_ArrayConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_ArrayConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_ArrayConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_ArrayInstantiationBySize.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_ArrayInstantiationBySize.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_ArrayInstantiationBySize.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_ArrayInstantiationBySize.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_ArrayInstantiationByValuesTyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_ArrayInstantiationByValuesTyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_ArrayInstantiationByValuesTyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_ArrayInstantiationByValuesTyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_ArrayInstantiationByValuesUntyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_ArrayInstantiationByValuesUntyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_ArrayInstantiationByValuesUntyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_ArrayInstantiationByValuesUntyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_BinaryIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_BinaryIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_BinaryIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_BinaryIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_BinaryLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_BinaryLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_BinaryLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_BinaryLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_BooleanLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_BooleanLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_BooleanLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_BooleanLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_CastExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_CastExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_CastExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_CastExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_CharacterLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_CharacterLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_CharacterLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_CharacterLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_ClassTypeConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_ClassTypeConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_ClassTypeConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_ClassTypeConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_DecimalDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_DecimalDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_DecimalDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_DecimalDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_DecimalFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_DecimalFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_DecimalFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_DecimalFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_DecimalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_DecimalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_DecimalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_DecimalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_DecimalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_DecimalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_DecimalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_DecimalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_ExplicitConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_ExplicitConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_ExplicitConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_ExplicitConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_HexDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_HexDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_HexDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_HexDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_HexFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_HexFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_HexFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_HexFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_HexIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_HexIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_HexIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_HexIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_HexLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_HexLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_HexLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_HexLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_MultiplicativeExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_MultiplicativeExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_MultiplicativeExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_MultiplicativeExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_NestedExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_NestedExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_NestedExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_NestedExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_NewConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_NewConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_NewConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_NewConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_NewConstructorCallWithInferredTypeArguments.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_NewConstructorCallWithInferredTypeArguments.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_NewConstructorCallWithInferredTypeArguments.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_NewConstructorCallWithInferredTypeArguments.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_NullLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_NullLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_NullLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_NullLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_OctalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_OctalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_OctalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_OctalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_OctalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_OctalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_OctalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_OctalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_PrefixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_PrefixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_PrefixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_PrefixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_PrimaryExpressionReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_PrimaryExpressionReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_PrimaryExpressionReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_PrimaryExpressionReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_PrimitiveTypeReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_PrimitiveTypeReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_PrimitiveTypeReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_PrimitiveTypeReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_ReflectiveClassReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_ReflectiveClassReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_ReflectiveClassReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_ReflectiveClassReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_SelfReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_SelfReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_SelfReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_SelfReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_StringReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_StringReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_StringReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_StringReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_SuffixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_SuffixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_SuffixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_SuffixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_TextBlockReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_TextBlockReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_TextBlockReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_TextBlockReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_UnaryExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_UnaryExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAdditiveExpression_children_UnaryExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAdditiveExpression_children_UnaryExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_AdditiveExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_AdditiveExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_AdditiveExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_AdditiveExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_ArrayConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_ArrayConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_ArrayConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_ArrayConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_ArrayInstantiationBySize.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_ArrayInstantiationBySize.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_ArrayInstantiationBySize.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_ArrayInstantiationBySize.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_ArrayInstantiationByValuesTyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_ArrayInstantiationByValuesTyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_ArrayInstantiationByValuesTyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_ArrayInstantiationByValuesTyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_ArrayInstantiationByValuesUntyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_ArrayInstantiationByValuesUntyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_ArrayInstantiationByValuesUntyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_ArrayInstantiationByValuesUntyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_BinaryIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_BinaryIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_BinaryIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_BinaryIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_BinaryLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_BinaryLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_BinaryLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_BinaryLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_BooleanLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_BooleanLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_BooleanLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_BooleanLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_CastExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_CastExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_CastExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_CastExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_CharacterLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_CharacterLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_CharacterLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_CharacterLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_ClassTypeConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_ClassTypeConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_ClassTypeConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_ClassTypeConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_DecimalDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_DecimalDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_DecimalDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_DecimalDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_DecimalFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_DecimalFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_DecimalFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_DecimalFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_DecimalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_DecimalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_DecimalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_DecimalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_DecimalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_DecimalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_DecimalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_DecimalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_EqualityExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_EqualityExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_EqualityExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_EqualityExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_ExplicitConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_ExplicitConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_ExplicitConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_ExplicitConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_HexDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_HexDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_HexDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_HexDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_HexFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_HexFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_HexFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_HexFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_HexIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_HexIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_HexIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_HexIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_HexLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_HexLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_HexLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_HexLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_InstanceOfExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_InstanceOfExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_InstanceOfExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_InstanceOfExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_MultiplicativeExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_MultiplicativeExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_MultiplicativeExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_MultiplicativeExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_NestedExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_NestedExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_NestedExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_NestedExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_NewConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_NewConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_NewConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_NewConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_NewConstructorCallWithInferredTypeArguments.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_NewConstructorCallWithInferredTypeArguments.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_NewConstructorCallWithInferredTypeArguments.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_NewConstructorCallWithInferredTypeArguments.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_NullLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_NullLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_NullLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_NullLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_OctalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_OctalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_OctalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_OctalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_OctalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_OctalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_OctalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_OctalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_PrefixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_PrefixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_PrefixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_PrefixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_PrimaryExpressionReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_PrimaryExpressionReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_PrimaryExpressionReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_PrimaryExpressionReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_PrimitiveTypeReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_PrimitiveTypeReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_PrimitiveTypeReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_PrimitiveTypeReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_ReflectiveClassReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_ReflectiveClassReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_ReflectiveClassReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_ReflectiveClassReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_RelationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_RelationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_RelationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_RelationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_SelfReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_SelfReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_SelfReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_SelfReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_ShiftExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_ShiftExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_ShiftExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_ShiftExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_StringReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_StringReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_StringReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_StringReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_SuffixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_SuffixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_SuffixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_SuffixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_TextBlockReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_TextBlockReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_TextBlockReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_TextBlockReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_UnaryExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_UnaryExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAndExpression_children_UnaryExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAndExpression_children_UnaryExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotable_annotations_AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotable_annotations_AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotable_annotations_AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotable_annotations_AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_attribute_InterfaceMethod.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_attribute_InterfaceMethod.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_attribute_InterfaceMethod.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_attribute_InterfaceMethod.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_AdditiveExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_AdditiveExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_AdditiveExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_AdditiveExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_AndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_AndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_AndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_AndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ArrayConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ArrayConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ArrayConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ArrayConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ArrayInitializer.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ArrayInitializer.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ArrayInitializer.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ArrayInitializer.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ArrayInstantiationBySize.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ArrayInstantiationBySize.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ArrayInstantiationBySize.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ArrayInstantiationBySize.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ArrayInstantiationByValuesTyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ArrayInstantiationByValuesTyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ArrayInstantiationByValuesTyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ArrayInstantiationByValuesTyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ArrayInstantiationByValuesUntyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ArrayInstantiationByValuesUntyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ArrayInstantiationByValuesUntyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ArrayInstantiationByValuesUntyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_BinaryIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_BinaryIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_BinaryIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_BinaryIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_BinaryLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_BinaryLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_BinaryLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_BinaryLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_BooleanLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_BooleanLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_BooleanLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_BooleanLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_CastExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_CastExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_CastExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_CastExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_CharacterLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_CharacterLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_CharacterLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_CharacterLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ClassTypeConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ClassTypeConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ClassTypeConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ClassTypeConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ConditionalAndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ConditionalAndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ConditionalAndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ConditionalAndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ConditionalExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ConditionalExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ConditionalExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ConditionalExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ConditionalOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ConditionalOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ConditionalOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ConditionalOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_DecimalDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_DecimalDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_DecimalDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_DecimalDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_DecimalFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_DecimalFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_DecimalFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_DecimalFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_DecimalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_DecimalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_DecimalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_DecimalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_DecimalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_DecimalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_DecimalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_DecimalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_EqualityExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_EqualityExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_EqualityExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_EqualityExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ExclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ExclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ExclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ExclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ExplicitConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ExplicitConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ExplicitConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ExplicitConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_HexDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_HexDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_HexDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_HexDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_HexFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_HexFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_HexFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_HexFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_HexIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_HexIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_HexIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_HexIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_HexLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_HexLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_HexLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_HexLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_InclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_InclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_InclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_InclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_InstanceOfExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_InstanceOfExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_InstanceOfExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_InstanceOfExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_MultiplicativeExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_MultiplicativeExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_MultiplicativeExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_MultiplicativeExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_NestedExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_NestedExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_NestedExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_NestedExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_NewConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_NewConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_NewConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_NewConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_NewConstructorCallWithInferredTypeArguments.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_NewConstructorCallWithInferredTypeArguments.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_NewConstructorCallWithInferredTypeArguments.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_NewConstructorCallWithInferredTypeArguments.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_NullLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_NullLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_NullLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_NullLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_OctalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_OctalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_OctalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_OctalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_OctalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_OctalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_OctalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_OctalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_PrefixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_PrefixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_PrefixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_PrefixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_PrimaryExpressionReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_PrimaryExpressionReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_PrimaryExpressionReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_PrimaryExpressionReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_PrimitiveTypeReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_PrimitiveTypeReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_PrimitiveTypeReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_PrimitiveTypeReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ReflectiveClassReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ReflectiveClassReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ReflectiveClassReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ReflectiveClassReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_RelationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_RelationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_RelationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_RelationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_SelfReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_SelfReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_SelfReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_SelfReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ShiftExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ShiftExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ShiftExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_ShiftExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_StringReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_StringReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_StringReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_StringReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_SuffixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_SuffixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_SuffixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_SuffixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_TextBlockReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_TextBlockReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_TextBlockReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_TextBlockReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_UnaryExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_UnaryExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationAttributeSetting_value_UnaryExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationAttributeSetting_value_UnaryExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationInstance_parameter_AnnotationParameterList.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationInstance_parameter_AnnotationParameterList.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationInstance_parameter_AnnotationParameterList.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationInstance_parameter_AnnotationParameterList.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationInstance_parameter_SingleAnnotationParameter.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationInstance_parameter_SingleAnnotationParameter.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationInstance_parameter_SingleAnnotationParameter.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationInstance_parameter_SingleAnnotationParameter.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationParameterList_settings_AnnotationAttributeSetting.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationParameterList_settings_AnnotationAttributeSetting.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAnnotationParameterList_settings_AnnotationAttributeSetting.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAnnotationParameterList_settings_AnnotationAttributeSetting.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_AdditiveExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_AdditiveExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_AdditiveExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_AdditiveExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_AndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_AndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_AndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_AndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_ArrayConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_ArrayConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_ArrayConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_ArrayConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_ArrayInstantiationBySize.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_ArrayInstantiationBySize.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_ArrayInstantiationBySize.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_ArrayInstantiationBySize.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_ArrayInstantiationByValuesTyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_ArrayInstantiationByValuesTyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_ArrayInstantiationByValuesTyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_ArrayInstantiationByValuesTyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_ArrayInstantiationByValuesUntyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_ArrayInstantiationByValuesUntyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_ArrayInstantiationByValuesUntyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_ArrayInstantiationByValuesUntyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_AssignmentExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_AssignmentExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_AssignmentExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_AssignmentExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_BinaryIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_BinaryIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_BinaryIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_BinaryIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_BinaryLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_BinaryLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_BinaryLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_BinaryLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_BooleanLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_BooleanLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_BooleanLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_BooleanLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_CastExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_CastExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_CastExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_CastExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_CharacterLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_CharacterLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_CharacterLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_CharacterLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_ClassTypeConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_ClassTypeConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_ClassTypeConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_ClassTypeConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_ConditionalAndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_ConditionalAndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_ConditionalAndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_ConditionalAndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_ConditionalExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_ConditionalExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_ConditionalExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_ConditionalExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_ConditionalOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_ConditionalOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_ConditionalOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_ConditionalOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_DecimalDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_DecimalDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_DecimalDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_DecimalDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_DecimalFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_DecimalFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_DecimalFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_DecimalFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_DecimalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_DecimalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_DecimalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_DecimalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_DecimalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_DecimalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_DecimalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_DecimalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_EqualityExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_EqualityExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_EqualityExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_EqualityExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_ExclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_ExclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_ExclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_ExclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_ExplicitConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_ExplicitConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_ExplicitConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_ExplicitConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_HexDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_HexDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_HexDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_HexDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_HexFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_HexFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_HexFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_HexFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_HexIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_HexIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_HexIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_HexIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_HexLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_HexLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_HexLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_HexLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_InclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_InclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_InclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_InclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_InstanceOfExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_InstanceOfExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_InstanceOfExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_InstanceOfExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_LambdaExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_LambdaExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_LambdaExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_LambdaExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_MultiplicativeExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_MultiplicativeExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_MultiplicativeExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_MultiplicativeExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_NestedExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_NestedExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_NestedExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_NestedExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_NewConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_NewConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_NewConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_NewConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_NewConstructorCallWithInferredTypeArguments.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_NewConstructorCallWithInferredTypeArguments.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_NewConstructorCallWithInferredTypeArguments.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_NewConstructorCallWithInferredTypeArguments.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_NullLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_NullLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_NullLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_NullLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_OctalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_OctalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_OctalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_OctalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_OctalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_OctalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_OctalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_OctalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_PrefixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_PrefixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_PrefixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_PrefixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_PrimaryExpressionReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_PrimaryExpressionReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_PrimaryExpressionReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_PrimaryExpressionReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_PrimitiveTypeReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_PrimitiveTypeReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_PrimitiveTypeReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_PrimitiveTypeReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_ReflectiveClassReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_ReflectiveClassReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_ReflectiveClassReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_ReflectiveClassReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_RelationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_RelationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_RelationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_RelationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_SelfReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_SelfReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_SelfReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_SelfReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_ShiftExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_ShiftExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_ShiftExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_ShiftExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_StringReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_StringReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_StringReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_StringReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_SuffixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_SuffixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_SuffixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_SuffixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_TextBlockReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_TextBlockReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_TextBlockReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_TextBlockReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_UnaryExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_UnaryExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArgumentable_arguments_UnaryExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArgumentable_arguments_UnaryExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_AdditiveExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_AdditiveExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_AdditiveExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_AdditiveExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_AndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_AndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_AndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_AndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_ArrayConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_ArrayConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_ArrayConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_ArrayConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_ArrayInitializer.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_ArrayInitializer.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_ArrayInitializer.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_ArrayInitializer.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_ArrayInstantiationBySize.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_ArrayInstantiationBySize.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_ArrayInstantiationBySize.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_ArrayInstantiationBySize.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_ArrayInstantiationByValuesTyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_ArrayInstantiationByValuesTyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_ArrayInstantiationByValuesTyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_ArrayInstantiationByValuesTyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_ArrayInstantiationByValuesUntyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_ArrayInstantiationByValuesUntyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_ArrayInstantiationByValuesUntyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_ArrayInstantiationByValuesUntyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_AssignmentExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_AssignmentExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_AssignmentExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_AssignmentExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_BinaryIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_BinaryIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_BinaryIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_BinaryIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_BinaryLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_BinaryLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_BinaryLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_BinaryLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_BooleanLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_BooleanLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_BooleanLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_BooleanLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_CastExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_CastExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_CastExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_CastExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_CharacterLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_CharacterLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_CharacterLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_CharacterLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_ClassTypeConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_ClassTypeConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_ClassTypeConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_ClassTypeConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_ConditionalAndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_ConditionalAndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_ConditionalAndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_ConditionalAndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_ConditionalExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_ConditionalExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_ConditionalExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_ConditionalExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_ConditionalOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_ConditionalOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_ConditionalOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_ConditionalOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_DecimalDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_DecimalDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_DecimalDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_DecimalDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_DecimalFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_DecimalFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_DecimalFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_DecimalFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_DecimalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_DecimalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_DecimalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_DecimalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_DecimalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_DecimalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_DecimalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_DecimalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_EqualityExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_EqualityExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_EqualityExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_EqualityExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_ExclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_ExclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_ExclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_ExclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_ExplicitConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_ExplicitConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_ExplicitConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_ExplicitConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_HexDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_HexDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_HexDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_HexDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_HexFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_HexFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_HexFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_HexFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_HexIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_HexIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_HexIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_HexIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_HexLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_HexLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_HexLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_HexLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_InclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_InclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_InclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_InclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_InstanceOfExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_InstanceOfExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_InstanceOfExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_InstanceOfExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_LambdaExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_LambdaExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_LambdaExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_LambdaExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_MultiplicativeExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_MultiplicativeExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_MultiplicativeExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_MultiplicativeExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_NestedExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_NestedExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_NestedExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_NestedExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_NewConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_NewConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_NewConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_NewConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_NewConstructorCallWithInferredTypeArguments.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_NewConstructorCallWithInferredTypeArguments.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_NewConstructorCallWithInferredTypeArguments.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_NewConstructorCallWithInferredTypeArguments.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_NullLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_NullLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_NullLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_NullLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_OctalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_OctalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_OctalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_OctalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_OctalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_OctalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_OctalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_OctalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_PrefixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_PrefixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_PrefixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_PrefixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_PrimaryExpressionReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_PrimaryExpressionReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_PrimaryExpressionReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_PrimaryExpressionReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_PrimitiveTypeReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_PrimitiveTypeReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_PrimitiveTypeReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_PrimitiveTypeReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_ReflectiveClassReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_ReflectiveClassReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_ReflectiveClassReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_ReflectiveClassReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_RelationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_RelationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_RelationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_RelationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_SelfReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_SelfReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_SelfReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_SelfReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_ShiftExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_ShiftExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_ShiftExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_ShiftExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_StringReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_StringReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_StringReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_StringReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_SuffixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_SuffixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_SuffixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_SuffixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_TextBlockReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_TextBlockReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_TextBlockReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_TextBlockReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_UnaryExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_UnaryExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInitializer_initialValues_UnaryExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInitializer_initialValues_UnaryExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_AdditiveExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_AdditiveExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_AdditiveExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_AdditiveExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_AndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_AndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_AndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_AndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ArrayConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ArrayConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ArrayConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ArrayConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ArrayInstantiationBySize.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ArrayInstantiationBySize.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ArrayInstantiationBySize.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ArrayInstantiationBySize.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ArrayInstantiationByValuesTyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ArrayInstantiationByValuesTyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ArrayInstantiationByValuesTyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ArrayInstantiationByValuesTyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ArrayInstantiationByValuesUntyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ArrayInstantiationByValuesUntyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ArrayInstantiationByValuesUntyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ArrayInstantiationByValuesUntyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_AssignmentExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_AssignmentExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_AssignmentExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_AssignmentExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_BinaryIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_BinaryIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_BinaryIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_BinaryIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_BinaryLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_BinaryLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_BinaryLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_BinaryLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_BooleanLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_BooleanLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_BooleanLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_BooleanLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_CastExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_CastExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_CastExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_CastExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_CharacterLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_CharacterLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_CharacterLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_CharacterLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ClassTypeConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ClassTypeConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ClassTypeConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ClassTypeConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ConditionalAndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ConditionalAndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ConditionalAndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ConditionalAndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ConditionalExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ConditionalExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ConditionalExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ConditionalExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ConditionalOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ConditionalOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ConditionalOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ConditionalOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_DecimalDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_DecimalDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_DecimalDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_DecimalDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_DecimalFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_DecimalFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_DecimalFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_DecimalFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_DecimalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_DecimalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_DecimalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_DecimalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_DecimalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_DecimalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_DecimalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_DecimalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_EqualityExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_EqualityExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_EqualityExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_EqualityExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ExclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ExclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ExclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ExclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ExplicitConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ExplicitConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ExplicitConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ExplicitConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_HexDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_HexDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_HexDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_HexDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_HexFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_HexFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_HexFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_HexFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_HexIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_HexIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_HexIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_HexIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_HexLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_HexLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_HexLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_HexLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_InclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_InclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_InclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_InclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_InstanceOfExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_InstanceOfExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_InstanceOfExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_InstanceOfExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_LambdaExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_LambdaExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_LambdaExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_LambdaExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_MultiplicativeExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_MultiplicativeExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_MultiplicativeExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_MultiplicativeExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_NestedExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_NestedExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_NestedExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_NestedExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_NewConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_NewConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_NewConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_NewConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_NewConstructorCallWithInferredTypeArguments.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_NewConstructorCallWithInferredTypeArguments.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_NewConstructorCallWithInferredTypeArguments.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_NewConstructorCallWithInferredTypeArguments.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_NullLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_NullLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_NullLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_NullLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_OctalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_OctalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_OctalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_OctalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_OctalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_OctalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_OctalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_OctalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_PrefixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_PrefixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_PrefixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_PrefixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_PrimaryExpressionReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_PrimaryExpressionReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_PrimaryExpressionReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_PrimaryExpressionReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_PrimitiveTypeReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_PrimitiveTypeReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_PrimitiveTypeReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_PrimitiveTypeReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ReflectiveClassReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ReflectiveClassReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ReflectiveClassReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ReflectiveClassReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_RelationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_RelationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_RelationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_RelationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_SelfReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_SelfReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_SelfReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_SelfReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ShiftExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ShiftExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ShiftExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_ShiftExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_StringReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_StringReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_StringReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_StringReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_SuffixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_SuffixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_SuffixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_SuffixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_TextBlockReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_TextBlockReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_TextBlockReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_TextBlockReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_UnaryExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_UnaryExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_UnaryExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationBySize_sizes_UnaryExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationByValues_arrayInitializer_ArrayInitializer.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationByValues_arrayInitializer_ArrayInitializer.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayInstantiationByValues_arrayInitializer_ArrayInitializer.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayInstantiationByValues_arrayInitializer_ArrayInitializer.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_AdditiveExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_AdditiveExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_AdditiveExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_AdditiveExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_AndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_AndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_AndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_AndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_ArrayConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_ArrayConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_ArrayConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_ArrayConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_ArrayInstantiationBySize.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_ArrayInstantiationBySize.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_ArrayInstantiationBySize.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_ArrayInstantiationBySize.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_ArrayInstantiationByValuesTyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_ArrayInstantiationByValuesTyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_ArrayInstantiationByValuesTyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_ArrayInstantiationByValuesTyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_ArrayInstantiationByValuesUntyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_ArrayInstantiationByValuesUntyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_ArrayInstantiationByValuesUntyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_ArrayInstantiationByValuesUntyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_AssignmentExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_AssignmentExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_AssignmentExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_AssignmentExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_BinaryIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_BinaryIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_BinaryIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_BinaryIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_BinaryLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_BinaryLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_BinaryLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_BinaryLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_BooleanLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_BooleanLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_BooleanLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_BooleanLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_CastExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_CastExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_CastExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_CastExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_CharacterLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_CharacterLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_CharacterLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_CharacterLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_ClassTypeConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_ClassTypeConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_ClassTypeConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_ClassTypeConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_ConditionalAndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_ConditionalAndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_ConditionalAndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_ConditionalAndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_ConditionalExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_ConditionalExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_ConditionalExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_ConditionalExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_ConditionalOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_ConditionalOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_ConditionalOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_ConditionalOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_DecimalDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_DecimalDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_DecimalDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_DecimalDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_DecimalFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_DecimalFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_DecimalFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_DecimalFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_DecimalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_DecimalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_DecimalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_DecimalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_DecimalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_DecimalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_DecimalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_DecimalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_EqualityExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_EqualityExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_EqualityExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_EqualityExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_ExclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_ExclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_ExclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_ExclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_ExplicitConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_ExplicitConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_ExplicitConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_ExplicitConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_HexDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_HexDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_HexDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_HexDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_HexFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_HexFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_HexFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_HexFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_HexIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_HexIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_HexIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_HexIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_HexLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_HexLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_HexLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_HexLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_InclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_InclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_InclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_InclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_InstanceOfExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_InstanceOfExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_InstanceOfExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_InstanceOfExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_LambdaExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_LambdaExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_LambdaExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_LambdaExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_MultiplicativeExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_MultiplicativeExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_MultiplicativeExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_MultiplicativeExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_NestedExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_NestedExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_NestedExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_NestedExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_NewConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_NewConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_NewConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_NewConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_NewConstructorCallWithInferredTypeArguments.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_NewConstructorCallWithInferredTypeArguments.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_NewConstructorCallWithInferredTypeArguments.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_NewConstructorCallWithInferredTypeArguments.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_NullLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_NullLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_NullLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_NullLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_OctalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_OctalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_OctalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_OctalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_OctalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_OctalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_OctalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_OctalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_PrefixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_PrefixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_PrefixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_PrefixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_PrimaryExpressionReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_PrimaryExpressionReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_PrimaryExpressionReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_PrimaryExpressionReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_PrimitiveTypeReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_PrimitiveTypeReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_PrimitiveTypeReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_PrimitiveTypeReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_ReflectiveClassReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_ReflectiveClassReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_ReflectiveClassReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_ReflectiveClassReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_RelationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_RelationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_RelationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_RelationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_SelfReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_SelfReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_SelfReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_SelfReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_ShiftExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_ShiftExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_ShiftExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_ShiftExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_StringReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_StringReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_StringReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_StringReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_SuffixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_SuffixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_SuffixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_SuffixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_TextBlockReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_TextBlockReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_TextBlockReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_TextBlockReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_UnaryExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_UnaryExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArraySelector_position_UnaryExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArraySelector_position_UnaryExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayTypeable_arrayDimensionsAfter_ArrayDimension.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayTypeable_arrayDimensionsAfter_ArrayDimension.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayTypeable_arrayDimensionsAfter_ArrayDimension.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayTypeable_arrayDimensionsAfter_ArrayDimension.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayTypeable_arrayDimensionsBefore_ArrayDimension.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayTypeable_arrayDimensionsBefore_ArrayDimension.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateArrayTypeable_arrayDimensionsBefore_ArrayDimension.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateArrayTypeable_arrayDimensionsBefore_ArrayDimension.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_AdditiveExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_AdditiveExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_AdditiveExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_AdditiveExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_AndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_AndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_AndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_AndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_ArrayConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_ArrayConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_ArrayConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_ArrayConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_ArrayInstantiationBySize.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_ArrayInstantiationBySize.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_ArrayInstantiationBySize.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_ArrayInstantiationBySize.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_ArrayInstantiationByValuesTyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_ArrayInstantiationByValuesTyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_ArrayInstantiationByValuesTyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_ArrayInstantiationByValuesTyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_ArrayInstantiationByValuesUntyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_ArrayInstantiationByValuesUntyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_ArrayInstantiationByValuesUntyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_ArrayInstantiationByValuesUntyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_AssignmentExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_AssignmentExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_AssignmentExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_AssignmentExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_BinaryIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_BinaryIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_BinaryIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_BinaryIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_BinaryLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_BinaryLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_BinaryLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_BinaryLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_BooleanLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_BooleanLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_BooleanLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_BooleanLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_CastExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_CastExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_CastExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_CastExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_CharacterLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_CharacterLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_CharacterLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_CharacterLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_ClassTypeConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_ClassTypeConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_ClassTypeConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_ClassTypeConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_ConditionalAndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_ConditionalAndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_ConditionalAndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_ConditionalAndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_ConditionalExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_ConditionalExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_ConditionalExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_ConditionalExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_ConditionalOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_ConditionalOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_ConditionalOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_ConditionalOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_DecimalDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_DecimalDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_DecimalDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_DecimalDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_DecimalFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_DecimalFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_DecimalFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_DecimalFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_DecimalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_DecimalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_DecimalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_DecimalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_DecimalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_DecimalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_DecimalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_DecimalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_EqualityExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_EqualityExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_EqualityExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_EqualityExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_ExclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_ExclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_ExclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_ExclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_ExplicitConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_ExplicitConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_ExplicitConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_ExplicitConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_HexDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_HexDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_HexDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_HexDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_HexFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_HexFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_HexFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_HexFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_HexIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_HexIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_HexIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_HexIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_HexLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_HexLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_HexLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_HexLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_InclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_InclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_InclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_InclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_InstanceOfExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_InstanceOfExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_InstanceOfExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_InstanceOfExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_LambdaExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_LambdaExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_LambdaExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_LambdaExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_MultiplicativeExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_MultiplicativeExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_MultiplicativeExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_MultiplicativeExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_NestedExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_NestedExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_NestedExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_NestedExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_NewConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_NewConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_NewConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_NewConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_NewConstructorCallWithInferredTypeArguments.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_NewConstructorCallWithInferredTypeArguments.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_NewConstructorCallWithInferredTypeArguments.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_NewConstructorCallWithInferredTypeArguments.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_NullLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_NullLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_NullLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_NullLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_OctalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_OctalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_OctalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_OctalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_OctalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_OctalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_OctalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_OctalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_PrefixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_PrefixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_PrefixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_PrefixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_PrimaryExpressionReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_PrimaryExpressionReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_PrimaryExpressionReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_PrimaryExpressionReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_PrimitiveTypeReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_PrimitiveTypeReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_PrimitiveTypeReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_PrimitiveTypeReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_ReflectiveClassReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_ReflectiveClassReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_ReflectiveClassReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_ReflectiveClassReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_RelationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_RelationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_RelationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_RelationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_SelfReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_SelfReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_SelfReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_SelfReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_ShiftExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_ShiftExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_ShiftExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_ShiftExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_StringReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_StringReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_StringReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_StringReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_SuffixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_SuffixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_SuffixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_SuffixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_TextBlockReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_TextBlockReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_TextBlockReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_TextBlockReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_UnaryExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_UnaryExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssert_errorMessage_UnaryExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssert_errorMessage_UnaryExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_Assignment.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_Assignment.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_Assignment.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_Assignment.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_AssignmentAnd.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_AssignmentAnd.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_AssignmentAnd.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_AssignmentAnd.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_AssignmentDivision.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_AssignmentDivision.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_AssignmentDivision.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_AssignmentDivision.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_AssignmentExclusiveOr.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_AssignmentExclusiveOr.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_AssignmentExclusiveOr.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_AssignmentExclusiveOr.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_AssignmentLeftShift.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_AssignmentLeftShift.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_AssignmentLeftShift.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_AssignmentLeftShift.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_AssignmentMinus.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_AssignmentMinus.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_AssignmentMinus.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_AssignmentMinus.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_AssignmentModulo.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_AssignmentModulo.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_AssignmentModulo.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_AssignmentModulo.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_AssignmentMultiplication.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_AssignmentMultiplication.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_AssignmentMultiplication.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_AssignmentMultiplication.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_AssignmentOr.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_AssignmentOr.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_AssignmentOr.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_AssignmentOr.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_AssignmentPlus.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_AssignmentPlus.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_AssignmentPlus.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_AssignmentPlus.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_AssignmentRightShift.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_AssignmentRightShift.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_AssignmentRightShift.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_AssignmentRightShift.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_AssignmentUnsignedRightShift.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_AssignmentUnsignedRightShift.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_AssignmentUnsignedRightShift.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_assignmentOperator_AssignmentUnsignedRightShift.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_AdditiveExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_AdditiveExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_AdditiveExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_AdditiveExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_AndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_AndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_AndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_AndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_ArrayConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_ArrayConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_ArrayConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_ArrayConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_ArrayInstantiationBySize.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_ArrayInstantiationBySize.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_ArrayInstantiationBySize.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_ArrayInstantiationBySize.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_ArrayInstantiationByValuesTyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_ArrayInstantiationByValuesTyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_ArrayInstantiationByValuesTyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_ArrayInstantiationByValuesTyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_ArrayInstantiationByValuesUntyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_ArrayInstantiationByValuesUntyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_ArrayInstantiationByValuesUntyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_ArrayInstantiationByValuesUntyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_BinaryIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_BinaryIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_BinaryIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_BinaryIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_BinaryLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_BinaryLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_BinaryLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_BinaryLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_BooleanLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_BooleanLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_BooleanLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_BooleanLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_CastExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_CastExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_CastExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_CastExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_CharacterLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_CharacterLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_CharacterLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_CharacterLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_ClassTypeConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_ClassTypeConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_ClassTypeConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_ClassTypeConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_ConditionalAndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_ConditionalAndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_ConditionalAndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_ConditionalAndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_ConditionalExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_ConditionalExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_ConditionalExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_ConditionalExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_ConditionalOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_ConditionalOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_ConditionalOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_ConditionalOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_DecimalDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_DecimalDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_DecimalDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_DecimalDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_DecimalFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_DecimalFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_DecimalFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_DecimalFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_DecimalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_DecimalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_DecimalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_DecimalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_DecimalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_DecimalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_DecimalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_DecimalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_EqualityExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_EqualityExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_EqualityExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_EqualityExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_ExclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_ExclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_ExclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_ExclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_ExplicitConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_ExplicitConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_ExplicitConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_ExplicitConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_HexDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_HexDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_HexDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_HexDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_HexFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_HexFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_HexFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_HexFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_HexIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_HexIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_HexIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_HexIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_HexLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_HexLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_HexLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_HexLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_InclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_InclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_InclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_InclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_InstanceOfExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_InstanceOfExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_InstanceOfExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_InstanceOfExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_MultiplicativeExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_MultiplicativeExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_MultiplicativeExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_MultiplicativeExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_NestedExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_NestedExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_NestedExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_NestedExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_NewConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_NewConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_NewConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_NewConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_NewConstructorCallWithInferredTypeArguments.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_NewConstructorCallWithInferredTypeArguments.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_NewConstructorCallWithInferredTypeArguments.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_NewConstructorCallWithInferredTypeArguments.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_NullLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_NullLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_NullLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_NullLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_OctalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_OctalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_OctalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_OctalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_OctalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_OctalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_OctalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_OctalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_PrefixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_PrefixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_PrefixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_PrefixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_PrimaryExpressionReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_PrimaryExpressionReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_PrimaryExpressionReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_PrimaryExpressionReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_PrimitiveTypeReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_PrimitiveTypeReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_PrimitiveTypeReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_PrimitiveTypeReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_ReflectiveClassReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_ReflectiveClassReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_ReflectiveClassReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_ReflectiveClassReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_RelationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_RelationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_RelationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_RelationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_SelfReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_SelfReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_SelfReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_SelfReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_ShiftExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_ShiftExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_ShiftExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_ShiftExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_StringReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_StringReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_StringReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_StringReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_SuffixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_SuffixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_SuffixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_SuffixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_TextBlockReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_TextBlockReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_TextBlockReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_TextBlockReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_UnaryExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_UnaryExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_child_UnaryExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_child_UnaryExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_AdditiveExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_AdditiveExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_AdditiveExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_AdditiveExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_AndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_AndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_AndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_AndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_ArrayConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_ArrayConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_ArrayConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_ArrayConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_ArrayInstantiationBySize.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_ArrayInstantiationBySize.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_ArrayInstantiationBySize.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_ArrayInstantiationBySize.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_ArrayInstantiationByValuesTyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_ArrayInstantiationByValuesTyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_ArrayInstantiationByValuesTyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_ArrayInstantiationByValuesTyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_ArrayInstantiationByValuesUntyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_ArrayInstantiationByValuesUntyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_ArrayInstantiationByValuesUntyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_ArrayInstantiationByValuesUntyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_AssignmentExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_AssignmentExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_AssignmentExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_AssignmentExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_BinaryIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_BinaryIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_BinaryIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_BinaryIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_BinaryLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_BinaryLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_BinaryLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_BinaryLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_BooleanLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_BooleanLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_BooleanLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_BooleanLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_CastExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_CastExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_CastExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_CastExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_CharacterLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_CharacterLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_CharacterLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_CharacterLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_ClassTypeConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_ClassTypeConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_ClassTypeConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_ClassTypeConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_ConditionalAndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_ConditionalAndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_ConditionalAndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_ConditionalAndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_ConditionalExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_ConditionalExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_ConditionalExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_ConditionalExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_ConditionalOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_ConditionalOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_ConditionalOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_ConditionalOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_DecimalDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_DecimalDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_DecimalDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_DecimalDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_DecimalFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_DecimalFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_DecimalFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_DecimalFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_DecimalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_DecimalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_DecimalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_DecimalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_DecimalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_DecimalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_DecimalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_DecimalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_EqualityExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_EqualityExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_EqualityExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_EqualityExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_ExclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_ExclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_ExclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_ExclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_ExplicitConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_ExplicitConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_ExplicitConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_ExplicitConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_HexDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_HexDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_HexDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_HexDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_HexFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_HexFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_HexFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_HexFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_HexIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_HexIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_HexIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_HexIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_HexLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_HexLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_HexLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_HexLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_InclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_InclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_InclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_InclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_InstanceOfExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_InstanceOfExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_InstanceOfExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_InstanceOfExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_LambdaExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_LambdaExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_LambdaExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_LambdaExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_MultiplicativeExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_MultiplicativeExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_MultiplicativeExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_MultiplicativeExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_NestedExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_NestedExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_NestedExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_NestedExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_NewConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_NewConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_NewConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_NewConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_NewConstructorCallWithInferredTypeArguments.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_NewConstructorCallWithInferredTypeArguments.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_NewConstructorCallWithInferredTypeArguments.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_NewConstructorCallWithInferredTypeArguments.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_NullLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_NullLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_NullLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_NullLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_OctalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_OctalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_OctalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_OctalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_OctalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_OctalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_OctalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_OctalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_PrefixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_PrefixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_PrefixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_PrefixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_PrimaryExpressionReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_PrimaryExpressionReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_PrimaryExpressionReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_PrimaryExpressionReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_PrimitiveTypeReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_PrimitiveTypeReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_PrimitiveTypeReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_PrimitiveTypeReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_ReflectiveClassReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_ReflectiveClassReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_ReflectiveClassReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_ReflectiveClassReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_RelationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_RelationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_RelationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_RelationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_SelfReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_SelfReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_SelfReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_SelfReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_ShiftExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_ShiftExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_ShiftExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_ShiftExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_StringReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_StringReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_StringReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_StringReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_SuffixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_SuffixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_SuffixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_SuffixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_TextBlockReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_TextBlockReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_TextBlockReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_TextBlockReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_UnaryExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_UnaryExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateAssignmentExpression_value_UnaryExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateAssignmentExpression_value_UnaryExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlockContainer_block_Block.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlockContainer_block_Block.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlockContainer_block_Block.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlockContainer_block_Block.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlock_statements_Annotation.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlock_statements_Annotation.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlock_statements_Annotation.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlock_statements_Annotation.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlock_statements_Assert.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlock_statements_Assert.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlock_statements_Assert.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlock_statements_Assert.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlock_statements_Block.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlock_statements_Block.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlock_statements_Block.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlock_statements_Block.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlock_statements_Break.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlock_statements_Break.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlock_statements_Break.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlock_statements_Break.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlock_statements_Class.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlock_statements_Class.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlock_statements_Class.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlock_statements_Class.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlock_statements_Condition.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlock_statements_Condition.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlock_statements_Condition.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlock_statements_Condition.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlock_statements_Continue.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlock_statements_Continue.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlock_statements_Continue.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlock_statements_Continue.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlock_statements_DoWhileLoop.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlock_statements_DoWhileLoop.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlock_statements_DoWhileLoop.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlock_statements_DoWhileLoop.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlock_statements_EmptyStatement.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlock_statements_EmptyStatement.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlock_statements_EmptyStatement.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlock_statements_EmptyStatement.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlock_statements_Enumeration.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlock_statements_Enumeration.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlock_statements_Enumeration.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlock_statements_Enumeration.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlock_statements_ExpressionStatement.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlock_statements_ExpressionStatement.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlock_statements_ExpressionStatement.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlock_statements_ExpressionStatement.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlock_statements_ForEachLoop.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlock_statements_ForEachLoop.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlock_statements_ForEachLoop.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlock_statements_ForEachLoop.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlock_statements_ForLoop.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlock_statements_ForLoop.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlock_statements_ForLoop.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlock_statements_ForLoop.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlock_statements_Interface.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlock_statements_Interface.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlock_statements_Interface.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlock_statements_Interface.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlock_statements_JumpLabel.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlock_statements_JumpLabel.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlock_statements_JumpLabel.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlock_statements_JumpLabel.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlock_statements_LocalVariableStatement.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlock_statements_LocalVariableStatement.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlock_statements_LocalVariableStatement.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlock_statements_LocalVariableStatement.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlock_statements_Return.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlock_statements_Return.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlock_statements_Return.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlock_statements_Return.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlock_statements_Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlock_statements_Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlock_statements_Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlock_statements_Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlock_statements_SynchronizedBlock.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlock_statements_SynchronizedBlock.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlock_statements_SynchronizedBlock.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlock_statements_SynchronizedBlock.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlock_statements_Throw.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlock_statements_Throw.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlock_statements_Throw.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlock_statements_Throw.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlock_statements_TryBlock.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlock_statements_TryBlock.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlock_statements_TryBlock.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlock_statements_TryBlock.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlock_statements_WhileLoop.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlock_statements_WhileLoop.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlock_statements_WhileLoop.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlock_statements_WhileLoop.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlock_statements_YieldStatement.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlock_statements_YieldStatement.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateBlock_statements_YieldStatement.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateBlock_statements_YieldStatement.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCallTypeArgumentable_callTypeArguments_ExtendsTypeArgument.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCallTypeArgumentable_callTypeArguments_ExtendsTypeArgument.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCallTypeArgumentable_callTypeArguments_ExtendsTypeArgument.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCallTypeArgumentable_callTypeArguments_ExtendsTypeArgument.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCallTypeArgumentable_callTypeArguments_QualifiedTypeArgument.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCallTypeArgumentable_callTypeArguments_QualifiedTypeArgument.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCallTypeArgumentable_callTypeArguments_QualifiedTypeArgument.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCallTypeArgumentable_callTypeArguments_QualifiedTypeArgument.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCallTypeArgumentable_callTypeArguments_SuperTypeArgument.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCallTypeArgumentable_callTypeArguments_SuperTypeArgument.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCallTypeArgumentable_callTypeArguments_SuperTypeArgument.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCallTypeArgumentable_callTypeArguments_SuperTypeArgument.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCallTypeArgumentable_callTypeArguments_UnknownTypeArgument.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCallTypeArgumentable_callTypeArguments_UnknownTypeArgument.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCallTypeArgumentable_callTypeArguments_UnknownTypeArgument.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCallTypeArgumentable_callTypeArguments_UnknownTypeArgument.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_additionalBounds_Boolean.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_additionalBounds_Boolean.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_additionalBounds_Boolean.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_additionalBounds_Boolean.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_additionalBounds_Byte.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_additionalBounds_Byte.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_additionalBounds_Byte.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_additionalBounds_Byte.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_additionalBounds_Char.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_additionalBounds_Char.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_additionalBounds_Char.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_additionalBounds_Char.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_additionalBounds_ClassifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_additionalBounds_ClassifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_additionalBounds_ClassifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_additionalBounds_ClassifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_additionalBounds_Double.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_additionalBounds_Double.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_additionalBounds_Double.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_additionalBounds_Double.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_additionalBounds_Float.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_additionalBounds_Float.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_additionalBounds_Float.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_additionalBounds_Float.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_additionalBounds_InferableType.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_additionalBounds_InferableType.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_additionalBounds_InferableType.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_additionalBounds_InferableType.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_additionalBounds_Int.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_additionalBounds_Int.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_additionalBounds_Int.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_additionalBounds_Int.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_additionalBounds_Long.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_additionalBounds_Long.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_additionalBounds_Long.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_additionalBounds_Long.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_additionalBounds_NamespaceClassifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_additionalBounds_NamespaceClassifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_additionalBounds_NamespaceClassifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_additionalBounds_NamespaceClassifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_additionalBounds_Short.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_additionalBounds_Short.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_additionalBounds_Short.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_additionalBounds_Short.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_additionalBounds_Void.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_additionalBounds_Void.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_additionalBounds_Void.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_additionalBounds_Void.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_AdditiveExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_AdditiveExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_AdditiveExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_AdditiveExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_AndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_AndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_AndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_AndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_ArrayConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_ArrayConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_ArrayConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_ArrayConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_ArrayInstantiationBySize.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_ArrayInstantiationBySize.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_ArrayInstantiationBySize.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_ArrayInstantiationBySize.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_ArrayInstantiationByValuesTyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_ArrayInstantiationByValuesTyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_ArrayInstantiationByValuesTyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_ArrayInstantiationByValuesTyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_ArrayInstantiationByValuesUntyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_ArrayInstantiationByValuesUntyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_ArrayInstantiationByValuesUntyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_ArrayInstantiationByValuesUntyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_AssignmentExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_AssignmentExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_AssignmentExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_AssignmentExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_BinaryIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_BinaryIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_BinaryIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_BinaryIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_BinaryLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_BinaryLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_BinaryLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_BinaryLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_BooleanLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_BooleanLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_BooleanLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_BooleanLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_CastExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_CastExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_CastExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_CastExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_CharacterLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_CharacterLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_CharacterLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_CharacterLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_ClassTypeConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_ClassTypeConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_ClassTypeConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_ClassTypeConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_ConditionalAndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_ConditionalAndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_ConditionalAndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_ConditionalAndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_ConditionalExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_ConditionalExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_ConditionalExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_ConditionalExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_ConditionalOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_ConditionalOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_ConditionalOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_ConditionalOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_DecimalDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_DecimalDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_DecimalDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_DecimalDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_DecimalFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_DecimalFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_DecimalFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_DecimalFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_DecimalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_DecimalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_DecimalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_DecimalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_DecimalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_DecimalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_DecimalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_DecimalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_EqualityExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_EqualityExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_EqualityExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_EqualityExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_ExclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_ExclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_ExclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_ExclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_ExplicitConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_ExplicitConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_ExplicitConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_ExplicitConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_HexDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_HexDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_HexDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_HexDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_HexFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_HexFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_HexFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_HexFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_HexIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_HexIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_HexIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_HexIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_HexLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_HexLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_HexLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_HexLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_InclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_InclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_InclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_InclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_InstanceOfExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_InstanceOfExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_InstanceOfExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_InstanceOfExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_LambdaExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_LambdaExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_LambdaExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_LambdaExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_MultiplicativeExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_MultiplicativeExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_MultiplicativeExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_MultiplicativeExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_NestedExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_NestedExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_NestedExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_NestedExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_NewConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_NewConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_NewConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_NewConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_NewConstructorCallWithInferredTypeArguments.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_NewConstructorCallWithInferredTypeArguments.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_NewConstructorCallWithInferredTypeArguments.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_NewConstructorCallWithInferredTypeArguments.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_NullLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_NullLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_NullLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_NullLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_OctalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_OctalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_OctalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_OctalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_OctalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_OctalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_OctalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_OctalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_PrefixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_PrefixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_PrefixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_PrefixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_PrimaryExpressionReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_PrimaryExpressionReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_PrimaryExpressionReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_PrimaryExpressionReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_PrimitiveTypeReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_PrimitiveTypeReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_PrimitiveTypeReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_PrimitiveTypeReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_ReflectiveClassReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_ReflectiveClassReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_ReflectiveClassReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_ReflectiveClassReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_RelationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_RelationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_RelationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_RelationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_SelfReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_SelfReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_SelfReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_SelfReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_ShiftExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_ShiftExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_ShiftExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_ShiftExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_StringReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_StringReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_StringReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_StringReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_SuffixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_SuffixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_SuffixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_SuffixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_TextBlockReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_TextBlockReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_TextBlockReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_TextBlockReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_UnaryExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_UnaryExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCastExpression_generalChild_UnaryExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCastExpression_generalChild_UnaryExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCatchBlock_parameter_CatchParameter.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCatchBlock_parameter_CatchParameter.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCatchBlock_parameter_CatchParameter.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCatchBlock_parameter_CatchParameter.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCatchBlock_parameter_OrdinaryParameter.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCatchBlock_parameter_OrdinaryParameter.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCatchBlock_parameter_OrdinaryParameter.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCatchBlock_parameter_OrdinaryParameter.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCatchParameter_typeReferences_Boolean.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCatchParameter_typeReferences_Boolean.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCatchParameter_typeReferences_Boolean.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCatchParameter_typeReferences_Boolean.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCatchParameter_typeReferences_Byte.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCatchParameter_typeReferences_Byte.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCatchParameter_typeReferences_Byte.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCatchParameter_typeReferences_Byte.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCatchParameter_typeReferences_Char.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCatchParameter_typeReferences_Char.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCatchParameter_typeReferences_Char.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCatchParameter_typeReferences_Char.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCatchParameter_typeReferences_ClassifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCatchParameter_typeReferences_ClassifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCatchParameter_typeReferences_ClassifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCatchParameter_typeReferences_ClassifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCatchParameter_typeReferences_Double.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCatchParameter_typeReferences_Double.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCatchParameter_typeReferences_Double.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCatchParameter_typeReferences_Double.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCatchParameter_typeReferences_Float.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCatchParameter_typeReferences_Float.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCatchParameter_typeReferences_Float.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCatchParameter_typeReferences_Float.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCatchParameter_typeReferences_InferableType.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCatchParameter_typeReferences_InferableType.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCatchParameter_typeReferences_InferableType.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCatchParameter_typeReferences_InferableType.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCatchParameter_typeReferences_Int.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCatchParameter_typeReferences_Int.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCatchParameter_typeReferences_Int.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCatchParameter_typeReferences_Int.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCatchParameter_typeReferences_Long.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCatchParameter_typeReferences_Long.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCatchParameter_typeReferences_Long.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCatchParameter_typeReferences_Long.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCatchParameter_typeReferences_NamespaceClassifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCatchParameter_typeReferences_NamespaceClassifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCatchParameter_typeReferences_NamespaceClassifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCatchParameter_typeReferences_NamespaceClassifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCatchParameter_typeReferences_Short.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCatchParameter_typeReferences_Short.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCatchParameter_typeReferences_Short.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCatchParameter_typeReferences_Short.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCatchParameter_typeReferences_Void.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCatchParameter_typeReferences_Void.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCatchParameter_typeReferences_Void.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCatchParameter_typeReferences_Void.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateClass_extends_Boolean.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateClass_extends_Boolean.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateClass_extends_Boolean.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateClass_extends_Boolean.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateClass_extends_Byte.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateClass_extends_Byte.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateClass_extends_Byte.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateClass_extends_Byte.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateClass_extends_Char.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateClass_extends_Char.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateClass_extends_Char.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateClass_extends_Char.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateClass_extends_ClassifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateClass_extends_ClassifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateClass_extends_ClassifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateClass_extends_ClassifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateClass_extends_Double.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateClass_extends_Double.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateClass_extends_Double.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateClass_extends_Double.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateClass_extends_Float.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateClass_extends_Float.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateClass_extends_Float.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateClass_extends_Float.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateClass_extends_InferableType.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateClass_extends_InferableType.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateClass_extends_InferableType.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateClass_extends_InferableType.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateClass_extends_Int.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateClass_extends_Int.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateClass_extends_Int.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateClass_extends_Int.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateClass_extends_Long.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateClass_extends_Long.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateClass_extends_Long.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateClass_extends_Long.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateClass_extends_NamespaceClassifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateClass_extends_NamespaceClassifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateClass_extends_NamespaceClassifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateClass_extends_NamespaceClassifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateClass_extends_Short.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateClass_extends_Short.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateClass_extends_Short.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateClass_extends_Short.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateClass_extends_Void.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateClass_extends_Void.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateClass_extends_Void.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateClass_extends_Void.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCommentable_layoutInformations_AttributeLayoutInformation.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCommentable_layoutInformations_AttributeLayoutInformation.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCommentable_layoutInformations_AttributeLayoutInformation.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCommentable_layoutInformations_AttributeLayoutInformation.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCommentable_layoutInformations_KeywordLayoutInformation.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCommentable_layoutInformations_KeywordLayoutInformation.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCommentable_layoutInformations_KeywordLayoutInformation.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCommentable_layoutInformations_KeywordLayoutInformation.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCommentable_layoutInformations_MinimalLayoutInformation.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCommentable_layoutInformations_MinimalLayoutInformation.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCommentable_layoutInformations_MinimalLayoutInformation.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCommentable_layoutInformations_MinimalLayoutInformation.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCommentable_layoutInformations_ReferenceLayoutInformation.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCommentable_layoutInformations_ReferenceLayoutInformation.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCommentable_layoutInformations_ReferenceLayoutInformation.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCommentable_layoutInformations_ReferenceLayoutInformation.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCompilationUnit_classifiers_Annotation.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCompilationUnit_classifiers_Annotation.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCompilationUnit_classifiers_Annotation.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCompilationUnit_classifiers_Annotation.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCompilationUnit_classifiers_Class.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCompilationUnit_classifiers_Class.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCompilationUnit_classifiers_Class.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCompilationUnit_classifiers_Class.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCompilationUnit_classifiers_Enumeration.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCompilationUnit_classifiers_Enumeration.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCompilationUnit_classifiers_Enumeration.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCompilationUnit_classifiers_Enumeration.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCompilationUnit_classifiers_Interface.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCompilationUnit_classifiers_Interface.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCompilationUnit_classifiers_Interface.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCompilationUnit_classifiers_Interface.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConcreteClassifier_package_Package.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConcreteClassifier_package_Package.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConcreteClassifier_package_Package.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConcreteClassifier_package_Package.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCondition_elseStatement_Annotation.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCondition_elseStatement_Annotation.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCondition_elseStatement_Annotation.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCondition_elseStatement_Annotation.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCondition_elseStatement_Assert.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCondition_elseStatement_Assert.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCondition_elseStatement_Assert.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCondition_elseStatement_Assert.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCondition_elseStatement_Block.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCondition_elseStatement_Block.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCondition_elseStatement_Block.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCondition_elseStatement_Block.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCondition_elseStatement_Break.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCondition_elseStatement_Break.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCondition_elseStatement_Break.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCondition_elseStatement_Break.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCondition_elseStatement_Class.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCondition_elseStatement_Class.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCondition_elseStatement_Class.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCondition_elseStatement_Class.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCondition_elseStatement_Condition.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCondition_elseStatement_Condition.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCondition_elseStatement_Condition.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCondition_elseStatement_Condition.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCondition_elseStatement_Continue.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCondition_elseStatement_Continue.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCondition_elseStatement_Continue.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCondition_elseStatement_Continue.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCondition_elseStatement_DoWhileLoop.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCondition_elseStatement_DoWhileLoop.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCondition_elseStatement_DoWhileLoop.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCondition_elseStatement_DoWhileLoop.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCondition_elseStatement_EmptyStatement.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCondition_elseStatement_EmptyStatement.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCondition_elseStatement_EmptyStatement.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCondition_elseStatement_EmptyStatement.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCondition_elseStatement_Enumeration.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCondition_elseStatement_Enumeration.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCondition_elseStatement_Enumeration.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCondition_elseStatement_Enumeration.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCondition_elseStatement_ExpressionStatement.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCondition_elseStatement_ExpressionStatement.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCondition_elseStatement_ExpressionStatement.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCondition_elseStatement_ExpressionStatement.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCondition_elseStatement_ForEachLoop.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCondition_elseStatement_ForEachLoop.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCondition_elseStatement_ForEachLoop.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCondition_elseStatement_ForEachLoop.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCondition_elseStatement_ForLoop.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCondition_elseStatement_ForLoop.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCondition_elseStatement_ForLoop.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCondition_elseStatement_ForLoop.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCondition_elseStatement_Interface.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCondition_elseStatement_Interface.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCondition_elseStatement_Interface.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCondition_elseStatement_Interface.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCondition_elseStatement_JumpLabel.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCondition_elseStatement_JumpLabel.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCondition_elseStatement_JumpLabel.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCondition_elseStatement_JumpLabel.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCondition_elseStatement_LocalVariableStatement.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCondition_elseStatement_LocalVariableStatement.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCondition_elseStatement_LocalVariableStatement.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCondition_elseStatement_LocalVariableStatement.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCondition_elseStatement_Return.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCondition_elseStatement_Return.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCondition_elseStatement_Return.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCondition_elseStatement_Return.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCondition_elseStatement_Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCondition_elseStatement_Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCondition_elseStatement_Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCondition_elseStatement_Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCondition_elseStatement_SynchronizedBlock.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCondition_elseStatement_SynchronizedBlock.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCondition_elseStatement_SynchronizedBlock.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCondition_elseStatement_SynchronizedBlock.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCondition_elseStatement_Throw.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCondition_elseStatement_Throw.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCondition_elseStatement_Throw.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCondition_elseStatement_Throw.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCondition_elseStatement_TryBlock.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCondition_elseStatement_TryBlock.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCondition_elseStatement_TryBlock.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCondition_elseStatement_TryBlock.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCondition_elseStatement_WhileLoop.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCondition_elseStatement_WhileLoop.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCondition_elseStatement_WhileLoop.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCondition_elseStatement_WhileLoop.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCondition_elseStatement_YieldStatement.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCondition_elseStatement_YieldStatement.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateCondition_elseStatement_YieldStatement.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateCondition_elseStatement_YieldStatement.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_AdditiveExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_AdditiveExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_AdditiveExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_AdditiveExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_AndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_AndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_AndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_AndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_ArrayConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_ArrayConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_ArrayConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_ArrayConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_ArrayInstantiationBySize.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_ArrayInstantiationBySize.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_ArrayInstantiationBySize.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_ArrayInstantiationBySize.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_ArrayInstantiationByValuesTyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_ArrayInstantiationByValuesTyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_ArrayInstantiationByValuesTyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_ArrayInstantiationByValuesTyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_ArrayInstantiationByValuesUntyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_ArrayInstantiationByValuesUntyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_ArrayInstantiationByValuesUntyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_ArrayInstantiationByValuesUntyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_BinaryIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_BinaryIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_BinaryIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_BinaryIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_BinaryLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_BinaryLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_BinaryLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_BinaryLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_BooleanLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_BooleanLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_BooleanLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_BooleanLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_CastExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_CastExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_CastExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_CastExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_CharacterLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_CharacterLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_CharacterLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_CharacterLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_ClassTypeConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_ClassTypeConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_ClassTypeConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_ClassTypeConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_DecimalDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_DecimalDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_DecimalDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_DecimalDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_DecimalFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_DecimalFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_DecimalFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_DecimalFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_DecimalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_DecimalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_DecimalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_DecimalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_DecimalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_DecimalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_DecimalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_DecimalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_EqualityExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_EqualityExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_EqualityExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_EqualityExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_ExclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_ExclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_ExclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_ExclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_ExplicitConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_ExplicitConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_ExplicitConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_ExplicitConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_HexDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_HexDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_HexDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_HexDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_HexFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_HexFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_HexFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_HexFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_HexIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_HexIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_HexIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_HexIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_HexLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_HexLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_HexLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_HexLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_InclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_InclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_InclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_InclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_InstanceOfExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_InstanceOfExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_InstanceOfExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_InstanceOfExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_MultiplicativeExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_MultiplicativeExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_MultiplicativeExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_MultiplicativeExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_NestedExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_NestedExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_NestedExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_NestedExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_NewConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_NewConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_NewConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_NewConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_NewConstructorCallWithInferredTypeArguments.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_NewConstructorCallWithInferredTypeArguments.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_NewConstructorCallWithInferredTypeArguments.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_NewConstructorCallWithInferredTypeArguments.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_NullLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_NullLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_NullLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_NullLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_OctalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_OctalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_OctalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_OctalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_OctalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_OctalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_OctalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_OctalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_PrefixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_PrefixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_PrefixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_PrefixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_PrimaryExpressionReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_PrimaryExpressionReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_PrimaryExpressionReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_PrimaryExpressionReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_PrimitiveTypeReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_PrimitiveTypeReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_PrimitiveTypeReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_PrimitiveTypeReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_ReflectiveClassReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_ReflectiveClassReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_ReflectiveClassReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_ReflectiveClassReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_RelationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_RelationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_RelationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_RelationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_SelfReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_SelfReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_SelfReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_SelfReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_ShiftExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_ShiftExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_ShiftExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_ShiftExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_StringReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_StringReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_StringReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_StringReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_SuffixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_SuffixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_SuffixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_SuffixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_TextBlockReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_TextBlockReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_TextBlockReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_TextBlockReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_UnaryExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_UnaryExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalAndExpression_children_UnaryExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalAndExpression_children_UnaryExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_AdditiveExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_AdditiveExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_AdditiveExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_AdditiveExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_AndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_AndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_AndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_AndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_ArrayConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_ArrayConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_ArrayConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_ArrayConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_ArrayInstantiationBySize.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_ArrayInstantiationBySize.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_ArrayInstantiationBySize.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_ArrayInstantiationBySize.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_ArrayInstantiationByValuesTyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_ArrayInstantiationByValuesTyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_ArrayInstantiationByValuesTyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_ArrayInstantiationByValuesTyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_ArrayInstantiationByValuesUntyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_ArrayInstantiationByValuesUntyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_ArrayInstantiationByValuesUntyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_ArrayInstantiationByValuesUntyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_BinaryIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_BinaryIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_BinaryIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_BinaryIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_BinaryLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_BinaryLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_BinaryLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_BinaryLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_BooleanLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_BooleanLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_BooleanLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_BooleanLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_CastExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_CastExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_CastExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_CastExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_CharacterLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_CharacterLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_CharacterLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_CharacterLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_ClassTypeConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_ClassTypeConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_ClassTypeConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_ClassTypeConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_ConditionalAndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_ConditionalAndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_ConditionalAndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_ConditionalAndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_ConditionalOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_ConditionalOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_ConditionalOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_ConditionalOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_DecimalDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_DecimalDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_DecimalDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_DecimalDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_DecimalFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_DecimalFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_DecimalFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_DecimalFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_DecimalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_DecimalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_DecimalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_DecimalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_DecimalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_DecimalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_DecimalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_DecimalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_EqualityExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_EqualityExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_EqualityExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_EqualityExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_ExclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_ExclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_ExclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_ExclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_ExplicitConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_ExplicitConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_ExplicitConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_ExplicitConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_HexDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_HexDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_HexDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_HexDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_HexFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_HexFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_HexFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_HexFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_HexIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_HexIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_HexIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_HexIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_HexLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_HexLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_HexLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_HexLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_InclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_InclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_InclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_InclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_InstanceOfExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_InstanceOfExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_InstanceOfExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_InstanceOfExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_MultiplicativeExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_MultiplicativeExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_MultiplicativeExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_MultiplicativeExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_NestedExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_NestedExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_NestedExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_NestedExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_NewConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_NewConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_NewConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_NewConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_NewConstructorCallWithInferredTypeArguments.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_NewConstructorCallWithInferredTypeArguments.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_NewConstructorCallWithInferredTypeArguments.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_NewConstructorCallWithInferredTypeArguments.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_NullLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_NullLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_NullLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_NullLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_OctalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_OctalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_OctalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_OctalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_OctalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_OctalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_OctalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_OctalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_PrefixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_PrefixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_PrefixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_PrefixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_PrimaryExpressionReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_PrimaryExpressionReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_PrimaryExpressionReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_PrimaryExpressionReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_PrimitiveTypeReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_PrimitiveTypeReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_PrimitiveTypeReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_PrimitiveTypeReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_ReflectiveClassReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_ReflectiveClassReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_ReflectiveClassReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_ReflectiveClassReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_RelationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_RelationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_RelationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_RelationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_SelfReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_SelfReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_SelfReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_SelfReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_ShiftExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_ShiftExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_ShiftExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_ShiftExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_StringReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_StringReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_StringReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_StringReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_SuffixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_SuffixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_SuffixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_SuffixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_TextBlockReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_TextBlockReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_TextBlockReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_TextBlockReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_UnaryExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_UnaryExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_child_UnaryExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_child_UnaryExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_AdditiveExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_AdditiveExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_AdditiveExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_AdditiveExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_AndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_AndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_AndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_AndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_ArrayConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_ArrayConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_ArrayConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_ArrayConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_ArrayInstantiationBySize.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_ArrayInstantiationBySize.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_ArrayInstantiationBySize.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_ArrayInstantiationBySize.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_ArrayInstantiationByValuesTyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_ArrayInstantiationByValuesTyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_ArrayInstantiationByValuesTyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_ArrayInstantiationByValuesTyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_ArrayInstantiationByValuesUntyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_ArrayInstantiationByValuesUntyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_ArrayInstantiationByValuesUntyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_ArrayInstantiationByValuesUntyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_AssignmentExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_AssignmentExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_AssignmentExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_AssignmentExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_BinaryIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_BinaryIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_BinaryIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_BinaryIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_BinaryLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_BinaryLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_BinaryLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_BinaryLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_BooleanLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_BooleanLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_BooleanLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_BooleanLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_CastExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_CastExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_CastExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_CastExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_CharacterLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_CharacterLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_CharacterLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_CharacterLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_ClassTypeConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_ClassTypeConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_ClassTypeConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_ClassTypeConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_ConditionalAndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_ConditionalAndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_ConditionalAndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_ConditionalAndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_ConditionalExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_ConditionalExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_ConditionalExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_ConditionalExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_ConditionalOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_ConditionalOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_ConditionalOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_ConditionalOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_DecimalDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_DecimalDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_DecimalDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_DecimalDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_DecimalFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_DecimalFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_DecimalFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_DecimalFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_DecimalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_DecimalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_DecimalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_DecimalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_DecimalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_DecimalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_DecimalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_DecimalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_EqualityExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_EqualityExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_EqualityExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_EqualityExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_ExclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_ExclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_ExclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_ExclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_ExplicitConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_ExplicitConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_ExplicitConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_ExplicitConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_HexDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_HexDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_HexDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_HexDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_HexFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_HexFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_HexFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_HexFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_HexIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_HexIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_HexIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_HexIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_HexLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_HexLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_HexLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_HexLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_InclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_InclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_InclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_InclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_InstanceOfExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_InstanceOfExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_InstanceOfExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_InstanceOfExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_LambdaExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_LambdaExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_LambdaExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_LambdaExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_MultiplicativeExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_MultiplicativeExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_MultiplicativeExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_MultiplicativeExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_NestedExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_NestedExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_NestedExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_NestedExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_NewConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_NewConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_NewConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_NewConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_NewConstructorCallWithInferredTypeArguments.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_NewConstructorCallWithInferredTypeArguments.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_NewConstructorCallWithInferredTypeArguments.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_NewConstructorCallWithInferredTypeArguments.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_NullLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_NullLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_NullLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_NullLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_OctalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_OctalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_OctalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_OctalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_OctalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_OctalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_OctalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_OctalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_PrefixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_PrefixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_PrefixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_PrefixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_PrimaryExpressionReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_PrimaryExpressionReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_PrimaryExpressionReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_PrimaryExpressionReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_PrimitiveTypeReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_PrimitiveTypeReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_PrimitiveTypeReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_PrimitiveTypeReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_ReflectiveClassReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_ReflectiveClassReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_ReflectiveClassReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_ReflectiveClassReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_RelationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_RelationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_RelationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_RelationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_SelfReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_SelfReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_SelfReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_SelfReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_ShiftExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_ShiftExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_ShiftExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_ShiftExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_StringReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_StringReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_StringReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_StringReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_SuffixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_SuffixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_SuffixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_SuffixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_TextBlockReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_TextBlockReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_TextBlockReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_TextBlockReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_UnaryExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_UnaryExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_expressionIf_UnaryExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_expressionIf_UnaryExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_AdditiveExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_AdditiveExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_AdditiveExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_AdditiveExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_AndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_AndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_AndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_AndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ArrayConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ArrayConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ArrayConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ArrayConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ArrayInstantiationBySize.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ArrayInstantiationBySize.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ArrayInstantiationBySize.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ArrayInstantiationBySize.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ArrayInstantiationByValuesTyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ArrayInstantiationByValuesTyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ArrayInstantiationByValuesTyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ArrayInstantiationByValuesTyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ArrayInstantiationByValuesUntyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ArrayInstantiationByValuesUntyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ArrayInstantiationByValuesUntyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ArrayInstantiationByValuesUntyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_AssignmentExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_AssignmentExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_AssignmentExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_AssignmentExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_BinaryIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_BinaryIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_BinaryIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_BinaryIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_BinaryLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_BinaryLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_BinaryLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_BinaryLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_BooleanLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_BooleanLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_BooleanLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_BooleanLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_CastExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_CastExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_CastExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_CastExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_CharacterLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_CharacterLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_CharacterLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_CharacterLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ClassTypeConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ClassTypeConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ClassTypeConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ClassTypeConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ConditionalAndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ConditionalAndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ConditionalAndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ConditionalAndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ConditionalExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ConditionalExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ConditionalExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ConditionalExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ConditionalOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ConditionalOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ConditionalOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ConditionalOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_DecimalDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_DecimalDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_DecimalDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_DecimalDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_DecimalFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_DecimalFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_DecimalFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_DecimalFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_DecimalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_DecimalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_DecimalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_DecimalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_DecimalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_DecimalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_DecimalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_DecimalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_EqualityExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_EqualityExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_EqualityExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_EqualityExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ExclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ExclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ExclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ExclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ExplicitConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ExplicitConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ExplicitConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ExplicitConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_HexDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_HexDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_HexDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_HexDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_HexFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_HexFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_HexFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_HexFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_HexIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_HexIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_HexIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_HexIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_HexLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_HexLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_HexLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_HexLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_InclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_InclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_InclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_InclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_InstanceOfExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_InstanceOfExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_InstanceOfExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_InstanceOfExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_LambdaExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_LambdaExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_LambdaExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_LambdaExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_MultiplicativeExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_MultiplicativeExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_MultiplicativeExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_MultiplicativeExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_NestedExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_NestedExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_NestedExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_NestedExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_NewConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_NewConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_NewConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_NewConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_NewConstructorCallWithInferredTypeArguments.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_NewConstructorCallWithInferredTypeArguments.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_NewConstructorCallWithInferredTypeArguments.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_NewConstructorCallWithInferredTypeArguments.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_NullLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_NullLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_NullLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_NullLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_OctalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_OctalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_OctalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_OctalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_OctalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_OctalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_OctalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_OctalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_PrefixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_PrefixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_PrefixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_PrefixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_PrimaryExpressionReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_PrimaryExpressionReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_PrimaryExpressionReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_PrimaryExpressionReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_PrimitiveTypeReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_PrimitiveTypeReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_PrimitiveTypeReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_PrimitiveTypeReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ReflectiveClassReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ReflectiveClassReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ReflectiveClassReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ReflectiveClassReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_RelationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_RelationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_RelationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_RelationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_SelfReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_SelfReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_SelfReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_SelfReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ShiftExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ShiftExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ShiftExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_ShiftExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_StringReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_StringReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_StringReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_StringReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_SuffixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_SuffixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_SuffixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_SuffixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_TextBlockReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_TextBlockReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_TextBlockReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_TextBlockReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_UnaryExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_UnaryExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_UnaryExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalExpression_generalExpressionElse_UnaryExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_AdditiveExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_AdditiveExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_AdditiveExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_AdditiveExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_AndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_AndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_AndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_AndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_ArrayConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_ArrayConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_ArrayConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_ArrayConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_ArrayInstantiationBySize.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_ArrayInstantiationBySize.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_ArrayInstantiationBySize.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_ArrayInstantiationBySize.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_ArrayInstantiationByValuesTyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_ArrayInstantiationByValuesTyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_ArrayInstantiationByValuesTyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_ArrayInstantiationByValuesTyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_ArrayInstantiationByValuesUntyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_ArrayInstantiationByValuesUntyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_ArrayInstantiationByValuesUntyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_ArrayInstantiationByValuesUntyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_BinaryIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_BinaryIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_BinaryIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_BinaryIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_BinaryLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_BinaryLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_BinaryLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_BinaryLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_BooleanLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_BooleanLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_BooleanLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_BooleanLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_CastExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_CastExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_CastExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_CastExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_CharacterLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_CharacterLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_CharacterLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_CharacterLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_ClassTypeConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_ClassTypeConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_ClassTypeConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_ClassTypeConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_ConditionalAndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_ConditionalAndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_ConditionalAndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_ConditionalAndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_DecimalDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_DecimalDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_DecimalDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_DecimalDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_DecimalFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_DecimalFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_DecimalFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_DecimalFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_DecimalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_DecimalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_DecimalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_DecimalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_DecimalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_DecimalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_DecimalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_DecimalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_EqualityExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_EqualityExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_EqualityExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_EqualityExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_ExclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_ExclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_ExclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_ExclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_ExplicitConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_ExplicitConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_ExplicitConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_ExplicitConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_HexDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_HexDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_HexDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_HexDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_HexFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_HexFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_HexFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_HexFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_HexIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_HexIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_HexIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_HexIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_HexLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_HexLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_HexLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_HexLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_InclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_InclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_InclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_InclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_InstanceOfExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_InstanceOfExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_InstanceOfExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_InstanceOfExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_MultiplicativeExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_MultiplicativeExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_MultiplicativeExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_MultiplicativeExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_NestedExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_NestedExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_NestedExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_NestedExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_NewConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_NewConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_NewConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_NewConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_NewConstructorCallWithInferredTypeArguments.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_NewConstructorCallWithInferredTypeArguments.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_NewConstructorCallWithInferredTypeArguments.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_NewConstructorCallWithInferredTypeArguments.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_NullLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_NullLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_NullLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_NullLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_OctalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_OctalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_OctalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_OctalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_OctalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_OctalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_OctalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_OctalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_PrefixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_PrefixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_PrefixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_PrefixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_PrimaryExpressionReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_PrimaryExpressionReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_PrimaryExpressionReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_PrimaryExpressionReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_PrimitiveTypeReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_PrimitiveTypeReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_PrimitiveTypeReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_PrimitiveTypeReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_ReflectiveClassReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_ReflectiveClassReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_ReflectiveClassReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_ReflectiveClassReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_RelationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_RelationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_RelationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_RelationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_SelfReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_SelfReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_SelfReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_SelfReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_ShiftExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_ShiftExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_ShiftExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_ShiftExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_StringReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_StringReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_StringReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_StringReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_SuffixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_SuffixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_SuffixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_SuffixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_TextBlockReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_TextBlockReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_TextBlockReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_TextBlockReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_UnaryExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_UnaryExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditionalOrExpression_children_UnaryExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditionalOrExpression_children_UnaryExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_AdditiveExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_AdditiveExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_AdditiveExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_AdditiveExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_AndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_AndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_AndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_AndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_ArrayConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_ArrayConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_ArrayConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_ArrayConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_ArrayInstantiationBySize.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_ArrayInstantiationBySize.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_ArrayInstantiationBySize.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_ArrayInstantiationBySize.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_ArrayInstantiationByValuesTyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_ArrayInstantiationByValuesTyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_ArrayInstantiationByValuesTyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_ArrayInstantiationByValuesTyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_ArrayInstantiationByValuesUntyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_ArrayInstantiationByValuesUntyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_ArrayInstantiationByValuesUntyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_ArrayInstantiationByValuesUntyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_AssignmentExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_AssignmentExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_AssignmentExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_AssignmentExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_BinaryIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_BinaryIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_BinaryIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_BinaryIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_BinaryLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_BinaryLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_BinaryLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_BinaryLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_BooleanLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_BooleanLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_BooleanLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_BooleanLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_CastExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_CastExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_CastExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_CastExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_CharacterLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_CharacterLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_CharacterLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_CharacterLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_ClassTypeConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_ClassTypeConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_ClassTypeConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_ClassTypeConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_ConditionalAndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_ConditionalAndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_ConditionalAndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_ConditionalAndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_ConditionalExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_ConditionalExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_ConditionalExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_ConditionalExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_ConditionalOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_ConditionalOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_ConditionalOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_ConditionalOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_DecimalDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_DecimalDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_DecimalDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_DecimalDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_DecimalFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_DecimalFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_DecimalFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_DecimalFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_DecimalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_DecimalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_DecimalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_DecimalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_DecimalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_DecimalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_DecimalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_DecimalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_EqualityExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_EqualityExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_EqualityExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_EqualityExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_ExclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_ExclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_ExclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_ExclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_ExplicitConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_ExplicitConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_ExplicitConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_ExplicitConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_HexDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_HexDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_HexDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_HexDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_HexFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_HexFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_HexFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_HexFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_HexIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_HexIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_HexIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_HexIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_HexLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_HexLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_HexLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_HexLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_InclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_InclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_InclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_InclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_InstanceOfExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_InstanceOfExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_InstanceOfExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_InstanceOfExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_LambdaExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_LambdaExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_LambdaExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_LambdaExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_MultiplicativeExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_MultiplicativeExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_MultiplicativeExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_MultiplicativeExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_NestedExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_NestedExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_NestedExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_NestedExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_NewConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_NewConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_NewConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_NewConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_NewConstructorCallWithInferredTypeArguments.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_NewConstructorCallWithInferredTypeArguments.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_NewConstructorCallWithInferredTypeArguments.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_NewConstructorCallWithInferredTypeArguments.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_NullLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_NullLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_NullLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_NullLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_OctalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_OctalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_OctalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_OctalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_OctalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_OctalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_OctalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_OctalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_PrefixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_PrefixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_PrefixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_PrefixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_PrimaryExpressionReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_PrimaryExpressionReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_PrimaryExpressionReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_PrimaryExpressionReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_PrimitiveTypeReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_PrimitiveTypeReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_PrimitiveTypeReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_PrimitiveTypeReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_ReflectiveClassReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_ReflectiveClassReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_ReflectiveClassReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_ReflectiveClassReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_RelationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_RelationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_RelationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_RelationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_SelfReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_SelfReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_SelfReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_SelfReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_ShiftExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_ShiftExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_ShiftExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_ShiftExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_StringReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_StringReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_StringReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_StringReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_SuffixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_SuffixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_SuffixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_SuffixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_TextBlockReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_TextBlockReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_TextBlockReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_TextBlockReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_UnaryExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_UnaryExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateConditional_condition_UnaryExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateConditional_condition_UnaryExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateElementReference_containedTarget_AdditionalField.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateElementReference_containedTarget_AdditionalField.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateElementReference_containedTarget_AdditionalField.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateElementReference_containedTarget_AdditionalField.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateElementReference_containedTarget_AdditionalLocalVariable.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateElementReference_containedTarget_AdditionalLocalVariable.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateElementReference_containedTarget_AdditionalLocalVariable.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateElementReference_containedTarget_AdditionalLocalVariable.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateElementReference_containedTarget_Annotation.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateElementReference_containedTarget_Annotation.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateElementReference_containedTarget_Annotation.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateElementReference_containedTarget_Annotation.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateElementReference_containedTarget_CatchParameter.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateElementReference_containedTarget_CatchParameter.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateElementReference_containedTarget_CatchParameter.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateElementReference_containedTarget_CatchParameter.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateElementReference_containedTarget_Class.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateElementReference_containedTarget_Class.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateElementReference_containedTarget_Class.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateElementReference_containedTarget_Class.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateElementReference_containedTarget_ClassMethod.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateElementReference_containedTarget_ClassMethod.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateElementReference_containedTarget_ClassMethod.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateElementReference_containedTarget_ClassMethod.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateElementReference_containedTarget_EnumConstant.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateElementReference_containedTarget_EnumConstant.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateElementReference_containedTarget_EnumConstant.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateElementReference_containedTarget_EnumConstant.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateElementReference_containedTarget_Enumeration.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateElementReference_containedTarget_Enumeration.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateElementReference_containedTarget_Enumeration.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateElementReference_containedTarget_Enumeration.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateElementReference_containedTarget_Field.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateElementReference_containedTarget_Field.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateElementReference_containedTarget_Field.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateElementReference_containedTarget_Field.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateElementReference_containedTarget_Interface.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateElementReference_containedTarget_Interface.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateElementReference_containedTarget_Interface.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateElementReference_containedTarget_Interface.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateElementReference_containedTarget_InterfaceMethod.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateElementReference_containedTarget_InterfaceMethod.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateElementReference_containedTarget_InterfaceMethod.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateElementReference_containedTarget_InterfaceMethod.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateElementReference_containedTarget_LocalVariable.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateElementReference_containedTarget_LocalVariable.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateElementReference_containedTarget_LocalVariable.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateElementReference_containedTarget_LocalVariable.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateElementReference_containedTarget_OrdinaryParameter.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateElementReference_containedTarget_OrdinaryParameter.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateElementReference_containedTarget_OrdinaryParameter.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateElementReference_containedTarget_OrdinaryParameter.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateElementReference_containedTarget_Package.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateElementReference_containedTarget_Package.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateElementReference_containedTarget_Package.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateElementReference_containedTarget_Package.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateElementReference_containedTarget_PackageReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateElementReference_containedTarget_PackageReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateElementReference_containedTarget_PackageReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateElementReference_containedTarget_PackageReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateElementReference_containedTarget_ReceiverParameter.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateElementReference_containedTarget_ReceiverParameter.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateElementReference_containedTarget_ReceiverParameter.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateElementReference_containedTarget_ReceiverParameter.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateElementReference_containedTarget_TypeParameter.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateElementReference_containedTarget_TypeParameter.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateElementReference_containedTarget_TypeParameter.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateElementReference_containedTarget_TypeParameter.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateElementReference_containedTarget_VariableLengthParameter.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateElementReference_containedTarget_VariableLengthParameter.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateElementReference_containedTarget_VariableLengthParameter.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateElementReference_containedTarget_VariableLengthParameter.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEnumConstant_anonymousClass_AnonymousClass.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEnumConstant_anonymousClass_AnonymousClass.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEnumConstant_anonymousClass_AnonymousClass.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEnumConstant_anonymousClass_AnonymousClass.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEnumeration_constants_EnumConstant.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEnumeration_constants_EnumConstant.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEnumeration_constants_EnumConstant.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEnumeration_constants_EnumConstant.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_AdditiveExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_AdditiveExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_AdditiveExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_AdditiveExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_ArrayConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_ArrayConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_ArrayConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_ArrayConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_ArrayInstantiationBySize.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_ArrayInstantiationBySize.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_ArrayInstantiationBySize.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_ArrayInstantiationBySize.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_ArrayInstantiationByValuesTyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_ArrayInstantiationByValuesTyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_ArrayInstantiationByValuesTyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_ArrayInstantiationByValuesTyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_ArrayInstantiationByValuesUntyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_ArrayInstantiationByValuesUntyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_ArrayInstantiationByValuesUntyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_ArrayInstantiationByValuesUntyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_BinaryIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_BinaryIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_BinaryIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_BinaryIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_BinaryLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_BinaryLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_BinaryLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_BinaryLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_BooleanLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_BooleanLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_BooleanLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_BooleanLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_CastExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_CastExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_CastExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_CastExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_CharacterLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_CharacterLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_CharacterLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_CharacterLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_ClassTypeConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_ClassTypeConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_ClassTypeConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_ClassTypeConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_DecimalDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_DecimalDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_DecimalDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_DecimalDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_DecimalFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_DecimalFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_DecimalFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_DecimalFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_DecimalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_DecimalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_DecimalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_DecimalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_DecimalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_DecimalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_DecimalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_DecimalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_ExplicitConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_ExplicitConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_ExplicitConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_ExplicitConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_HexDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_HexDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_HexDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_HexDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_HexFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_HexFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_HexFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_HexFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_HexIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_HexIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_HexIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_HexIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_HexLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_HexLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_HexLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_HexLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_InstanceOfExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_InstanceOfExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_InstanceOfExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_InstanceOfExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_MultiplicativeExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_MultiplicativeExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_MultiplicativeExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_MultiplicativeExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_NestedExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_NestedExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_NestedExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_NestedExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_NewConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_NewConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_NewConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_NewConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_NewConstructorCallWithInferredTypeArguments.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_NewConstructorCallWithInferredTypeArguments.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_NewConstructorCallWithInferredTypeArguments.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_NewConstructorCallWithInferredTypeArguments.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_NullLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_NullLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_NullLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_NullLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_OctalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_OctalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_OctalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_OctalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_OctalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_OctalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_OctalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_OctalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_PrefixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_PrefixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_PrefixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_PrefixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_PrimaryExpressionReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_PrimaryExpressionReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_PrimaryExpressionReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_PrimaryExpressionReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_PrimitiveTypeReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_PrimitiveTypeReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_PrimitiveTypeReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_PrimitiveTypeReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_ReflectiveClassReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_ReflectiveClassReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_ReflectiveClassReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_ReflectiveClassReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_RelationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_RelationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_RelationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_RelationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_SelfReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_SelfReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_SelfReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_SelfReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_ShiftExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_ShiftExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_ShiftExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_ShiftExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_StringReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_StringReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_StringReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_StringReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_SuffixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_SuffixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_SuffixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_SuffixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_TextBlockReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_TextBlockReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_TextBlockReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_TextBlockReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_UnaryExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_UnaryExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_children_UnaryExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_children_UnaryExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_equalityOperators_Equal.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_equalityOperators_Equal.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_equalityOperators_Equal.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_equalityOperators_Equal.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_equalityOperators_NotEqual.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_equalityOperators_NotEqual.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateEqualityExpression_equalityOperators_NotEqual.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateEqualityExpression_equalityOperators_NotEqual.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExceptionThrower_exceptions_NamespaceClassifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExceptionThrower_exceptions_NamespaceClassifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExceptionThrower_exceptions_NamespaceClassifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExceptionThrower_exceptions_NamespaceClassifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_AdditiveExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_AdditiveExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_AdditiveExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_AdditiveExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_AndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_AndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_AndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_AndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_ArrayConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_ArrayConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_ArrayConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_ArrayConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_ArrayInstantiationBySize.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_ArrayInstantiationBySize.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_ArrayInstantiationBySize.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_ArrayInstantiationBySize.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_ArrayInstantiationByValuesTyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_ArrayInstantiationByValuesTyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_ArrayInstantiationByValuesTyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_ArrayInstantiationByValuesTyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_ArrayInstantiationByValuesUntyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_ArrayInstantiationByValuesUntyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_ArrayInstantiationByValuesUntyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_ArrayInstantiationByValuesUntyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_BinaryIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_BinaryIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_BinaryIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_BinaryIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_BinaryLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_BinaryLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_BinaryLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_BinaryLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_BooleanLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_BooleanLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_BooleanLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_BooleanLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_CastExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_CastExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_CastExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_CastExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_CharacterLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_CharacterLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_CharacterLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_CharacterLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_ClassTypeConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_ClassTypeConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_ClassTypeConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_ClassTypeConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_DecimalDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_DecimalDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_DecimalDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_DecimalDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_DecimalFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_DecimalFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_DecimalFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_DecimalFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_DecimalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_DecimalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_DecimalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_DecimalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_DecimalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_DecimalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_DecimalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_DecimalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_EqualityExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_EqualityExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_EqualityExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_EqualityExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_ExplicitConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_ExplicitConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_ExplicitConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_ExplicitConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_HexDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_HexDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_HexDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_HexDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_HexFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_HexFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_HexFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_HexFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_HexIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_HexIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_HexIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_HexIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_HexLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_HexLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_HexLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_HexLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_InstanceOfExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_InstanceOfExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_InstanceOfExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_InstanceOfExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_MultiplicativeExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_MultiplicativeExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_MultiplicativeExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_MultiplicativeExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_NestedExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_NestedExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_NestedExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_NestedExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_NewConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_NewConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_NewConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_NewConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_NewConstructorCallWithInferredTypeArguments.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_NewConstructorCallWithInferredTypeArguments.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_NewConstructorCallWithInferredTypeArguments.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_NewConstructorCallWithInferredTypeArguments.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_NullLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_NullLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_NullLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_NullLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_OctalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_OctalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_OctalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_OctalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_OctalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_OctalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_OctalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_OctalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_PrefixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_PrefixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_PrefixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_PrefixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_PrimaryExpressionReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_PrimaryExpressionReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_PrimaryExpressionReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_PrimaryExpressionReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_PrimitiveTypeReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_PrimitiveTypeReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_PrimitiveTypeReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_PrimitiveTypeReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_ReflectiveClassReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_ReflectiveClassReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_ReflectiveClassReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_ReflectiveClassReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_RelationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_RelationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_RelationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_RelationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_SelfReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_SelfReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_SelfReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_SelfReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_ShiftExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_ShiftExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_ShiftExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_ShiftExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_StringReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_StringReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_StringReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_StringReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_SuffixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_SuffixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_SuffixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_SuffixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_TextBlockReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_TextBlockReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_TextBlockReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_TextBlockReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_UnaryExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_UnaryExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExclusiveOrExpression_children_UnaryExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExclusiveOrExpression_children_UnaryExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExplicitConstructorCall_callTarget_Super.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExplicitConstructorCall_callTarget_Super.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExplicitConstructorCall_callTarget_Super.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExplicitConstructorCall_callTarget_Super.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExplicitConstructorCall_callTarget_This.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExplicitConstructorCall_callTarget_This.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExplicitConstructorCall_callTarget_This.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExplicitConstructorCall_callTarget_This.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_AdditiveExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_AdditiveExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_AdditiveExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_AdditiveExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_AndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_AndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_AndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_AndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_ArrayConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_ArrayConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_ArrayConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_ArrayConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_ArrayInstantiationBySize.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_ArrayInstantiationBySize.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_ArrayInstantiationBySize.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_ArrayInstantiationBySize.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_ArrayInstantiationByValuesTyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_ArrayInstantiationByValuesTyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_ArrayInstantiationByValuesTyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_ArrayInstantiationByValuesTyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_ArrayInstantiationByValuesUntyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_ArrayInstantiationByValuesUntyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_ArrayInstantiationByValuesUntyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_ArrayInstantiationByValuesUntyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_AssignmentExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_AssignmentExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_AssignmentExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_AssignmentExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_BinaryIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_BinaryIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_BinaryIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_BinaryIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_BinaryLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_BinaryLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_BinaryLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_BinaryLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_BooleanLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_BooleanLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_BooleanLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_BooleanLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_CastExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_CastExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_CastExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_CastExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_CharacterLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_CharacterLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_CharacterLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_CharacterLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_ClassTypeConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_ClassTypeConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_ClassTypeConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_ClassTypeConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_ConditionalAndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_ConditionalAndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_ConditionalAndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_ConditionalAndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_ConditionalExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_ConditionalExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_ConditionalExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_ConditionalExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_ConditionalOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_ConditionalOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_ConditionalOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_ConditionalOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_DecimalDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_DecimalDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_DecimalDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_DecimalDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_DecimalFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_DecimalFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_DecimalFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_DecimalFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_DecimalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_DecimalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_DecimalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_DecimalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_DecimalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_DecimalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_DecimalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_DecimalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_EqualityExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_EqualityExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_EqualityExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_EqualityExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_ExclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_ExclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_ExclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_ExclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_ExplicitConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_ExplicitConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_ExplicitConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_ExplicitConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_HexDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_HexDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_HexDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_HexDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_HexFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_HexFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_HexFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_HexFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_HexIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_HexIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_HexIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_HexIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_HexLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_HexLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_HexLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_HexLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_InclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_InclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_InclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_InclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_InstanceOfExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_InstanceOfExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_InstanceOfExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_InstanceOfExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_LambdaExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_LambdaExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_LambdaExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_LambdaExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_MultiplicativeExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_MultiplicativeExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_MultiplicativeExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_MultiplicativeExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_NestedExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_NestedExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_NestedExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_NestedExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_NewConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_NewConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_NewConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_NewConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_NewConstructorCallWithInferredTypeArguments.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_NewConstructorCallWithInferredTypeArguments.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_NewConstructorCallWithInferredTypeArguments.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_NewConstructorCallWithInferredTypeArguments.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_NullLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_NullLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_NullLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_NullLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_OctalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_OctalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_OctalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_OctalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_OctalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_OctalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_OctalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_OctalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_PrefixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_PrefixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_PrefixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_PrefixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_PrimaryExpressionReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_PrimaryExpressionReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_PrimaryExpressionReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_PrimaryExpressionReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_PrimitiveTypeReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_PrimitiveTypeReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_PrimitiveTypeReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_PrimitiveTypeReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_ReflectiveClassReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_ReflectiveClassReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_ReflectiveClassReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_ReflectiveClassReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_RelationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_RelationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_RelationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_RelationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_SelfReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_SelfReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_SelfReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_SelfReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_ShiftExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_ShiftExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_ShiftExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_ShiftExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_StringReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_StringReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_StringReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_StringReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_SuffixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_SuffixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_SuffixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_SuffixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_TextBlockReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_TextBlockReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_TextBlockReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_TextBlockReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_UnaryExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_UnaryExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionList_expressions_UnaryExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionList_expressions_UnaryExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_AdditiveExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_AdditiveExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_AdditiveExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_AdditiveExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_AndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_AndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_AndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_AndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_ArrayConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_ArrayConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_ArrayConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_ArrayConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_ArrayInstantiationBySize.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_ArrayInstantiationBySize.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_ArrayInstantiationBySize.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_ArrayInstantiationBySize.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_ArrayInstantiationByValuesTyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_ArrayInstantiationByValuesTyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_ArrayInstantiationByValuesTyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_ArrayInstantiationByValuesTyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_ArrayInstantiationByValuesUntyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_ArrayInstantiationByValuesUntyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_ArrayInstantiationByValuesUntyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_ArrayInstantiationByValuesUntyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_AssignmentExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_AssignmentExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_AssignmentExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_AssignmentExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_BinaryIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_BinaryIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_BinaryIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_BinaryIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_BinaryLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_BinaryLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_BinaryLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_BinaryLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_BooleanLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_BooleanLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_BooleanLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_BooleanLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_CastExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_CastExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_CastExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_CastExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_CharacterLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_CharacterLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_CharacterLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_CharacterLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_ClassTypeConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_ClassTypeConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_ClassTypeConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_ClassTypeConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_ConditionalAndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_ConditionalAndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_ConditionalAndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_ConditionalAndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_ConditionalExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_ConditionalExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_ConditionalExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_ConditionalExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_ConditionalOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_ConditionalOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_ConditionalOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_ConditionalOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_DecimalDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_DecimalDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_DecimalDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_DecimalDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_DecimalFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_DecimalFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_DecimalFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_DecimalFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_DecimalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_DecimalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_DecimalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_DecimalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_DecimalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_DecimalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_DecimalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_DecimalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_EqualityExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_EqualityExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_EqualityExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_EqualityExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_ExclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_ExclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_ExclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_ExclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_ExplicitConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_ExplicitConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_ExplicitConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_ExplicitConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_HexDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_HexDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_HexDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_HexDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_HexFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_HexFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_HexFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_HexFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_HexIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_HexIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_HexIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_HexIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_HexLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_HexLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_HexLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_HexLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_InclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_InclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_InclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_InclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_InstanceOfExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_InstanceOfExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_InstanceOfExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_InstanceOfExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_LambdaExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_LambdaExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_LambdaExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_LambdaExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_MultiplicativeExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_MultiplicativeExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_MultiplicativeExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_MultiplicativeExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_NestedExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_NestedExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_NestedExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_NestedExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_NewConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_NewConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_NewConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_NewConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_NewConstructorCallWithInferredTypeArguments.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_NewConstructorCallWithInferredTypeArguments.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_NewConstructorCallWithInferredTypeArguments.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_NewConstructorCallWithInferredTypeArguments.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_NullLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_NullLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_NullLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_NullLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_OctalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_OctalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_OctalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_OctalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_OctalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_OctalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_OctalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_OctalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_PrefixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_PrefixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_PrefixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_PrefixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_PrimaryExpressionReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_PrimaryExpressionReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_PrimaryExpressionReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_PrimaryExpressionReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_PrimitiveTypeReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_PrimitiveTypeReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_PrimitiveTypeReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_PrimitiveTypeReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_ReflectiveClassReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_ReflectiveClassReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_ReflectiveClassReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_ReflectiveClassReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_RelationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_RelationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_RelationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_RelationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_SelfReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_SelfReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_SelfReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_SelfReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_ShiftExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_ShiftExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_ShiftExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_ShiftExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_StringReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_StringReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_StringReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_StringReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_SuffixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_SuffixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_SuffixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_SuffixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_TextBlockReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_TextBlockReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_TextBlockReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_TextBlockReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_UnaryExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_UnaryExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExpressionStatement_expression_UnaryExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExpressionStatement_expression_UnaryExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExtendsTypeArgument_extendType_Boolean.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExtendsTypeArgument_extendType_Boolean.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExtendsTypeArgument_extendType_Boolean.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExtendsTypeArgument_extendType_Boolean.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExtendsTypeArgument_extendType_Byte.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExtendsTypeArgument_extendType_Byte.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExtendsTypeArgument_extendType_Byte.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExtendsTypeArgument_extendType_Byte.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExtendsTypeArgument_extendType_Char.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExtendsTypeArgument_extendType_Char.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExtendsTypeArgument_extendType_Char.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExtendsTypeArgument_extendType_Char.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExtendsTypeArgument_extendType_ClassifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExtendsTypeArgument_extendType_ClassifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExtendsTypeArgument_extendType_ClassifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExtendsTypeArgument_extendType_ClassifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExtendsTypeArgument_extendType_Double.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExtendsTypeArgument_extendType_Double.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExtendsTypeArgument_extendType_Double.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExtendsTypeArgument_extendType_Double.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExtendsTypeArgument_extendType_Float.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExtendsTypeArgument_extendType_Float.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExtendsTypeArgument_extendType_Float.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExtendsTypeArgument_extendType_Float.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExtendsTypeArgument_extendType_InferableType.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExtendsTypeArgument_extendType_InferableType.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExtendsTypeArgument_extendType_InferableType.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExtendsTypeArgument_extendType_InferableType.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExtendsTypeArgument_extendType_Int.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExtendsTypeArgument_extendType_Int.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExtendsTypeArgument_extendType_Int.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExtendsTypeArgument_extendType_Int.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExtendsTypeArgument_extendType_Long.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExtendsTypeArgument_extendType_Long.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExtendsTypeArgument_extendType_Long.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExtendsTypeArgument_extendType_Long.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExtendsTypeArgument_extendType_NamespaceClassifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExtendsTypeArgument_extendType_NamespaceClassifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExtendsTypeArgument_extendType_NamespaceClassifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExtendsTypeArgument_extendType_NamespaceClassifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExtendsTypeArgument_extendType_Short.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExtendsTypeArgument_extendType_Short.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExtendsTypeArgument_extendType_Short.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExtendsTypeArgument_extendType_Short.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExtendsTypeArgument_extendType_Void.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExtendsTypeArgument_extendType_Void.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateExtendsTypeArgument_extendType_Void.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateExtendsTypeArgument_extendType_Void.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateField_additionalFields_AdditionalField.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateField_additionalFields_AdditionalField.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateField_additionalFields_AdditionalField.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateField_additionalFields_AdditionalField.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_AdditiveExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_AdditiveExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_AdditiveExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_AdditiveExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_AndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_AndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_AndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_AndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_ArrayConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_ArrayConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_ArrayConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_ArrayConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_ArrayInstantiationBySize.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_ArrayInstantiationBySize.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_ArrayInstantiationBySize.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_ArrayInstantiationBySize.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_ArrayInstantiationByValuesTyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_ArrayInstantiationByValuesTyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_ArrayInstantiationByValuesTyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_ArrayInstantiationByValuesTyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_ArrayInstantiationByValuesUntyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_ArrayInstantiationByValuesUntyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_ArrayInstantiationByValuesUntyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_ArrayInstantiationByValuesUntyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_AssignmentExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_AssignmentExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_AssignmentExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_AssignmentExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_BinaryIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_BinaryIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_BinaryIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_BinaryIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_BinaryLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_BinaryLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_BinaryLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_BinaryLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_BooleanLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_BooleanLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_BooleanLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_BooleanLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_CastExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_CastExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_CastExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_CastExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_CharacterLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_CharacterLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_CharacterLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_CharacterLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_ClassTypeConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_ClassTypeConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_ClassTypeConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_ClassTypeConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_ConditionalAndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_ConditionalAndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_ConditionalAndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_ConditionalAndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_ConditionalExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_ConditionalExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_ConditionalExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_ConditionalExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_ConditionalOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_ConditionalOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_ConditionalOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_ConditionalOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_DecimalDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_DecimalDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_DecimalDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_DecimalDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_DecimalFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_DecimalFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_DecimalFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_DecimalFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_DecimalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_DecimalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_DecimalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_DecimalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_DecimalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_DecimalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_DecimalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_DecimalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_EqualityExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_EqualityExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_EqualityExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_EqualityExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_ExclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_ExclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_ExclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_ExclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_ExplicitConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_ExplicitConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_ExplicitConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_ExplicitConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_HexDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_HexDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_HexDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_HexDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_HexFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_HexFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_HexFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_HexFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_HexIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_HexIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_HexIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_HexIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_HexLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_HexLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_HexLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_HexLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_InclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_InclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_InclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_InclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_InstanceOfExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_InstanceOfExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_InstanceOfExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_InstanceOfExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_LambdaExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_LambdaExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_LambdaExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_LambdaExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_MultiplicativeExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_MultiplicativeExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_MultiplicativeExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_MultiplicativeExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_NestedExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_NestedExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_NestedExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_NestedExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_NewConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_NewConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_NewConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_NewConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_NewConstructorCallWithInferredTypeArguments.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_NewConstructorCallWithInferredTypeArguments.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_NewConstructorCallWithInferredTypeArguments.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_NewConstructorCallWithInferredTypeArguments.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_NullLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_NullLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_NullLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_NullLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_OctalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_OctalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_OctalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_OctalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_OctalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_OctalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_OctalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_OctalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_PrefixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_PrefixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_PrefixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_PrefixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_PrimaryExpressionReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_PrimaryExpressionReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_PrimaryExpressionReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_PrimaryExpressionReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_PrimitiveTypeReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_PrimitiveTypeReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_PrimitiveTypeReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_PrimitiveTypeReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_ReflectiveClassReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_ReflectiveClassReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_ReflectiveClassReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_ReflectiveClassReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_RelationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_RelationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_RelationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_RelationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_SelfReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_SelfReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_SelfReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_SelfReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_ShiftExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_ShiftExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_ShiftExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_ShiftExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_StringReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_StringReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_StringReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_StringReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_SuffixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_SuffixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_SuffixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_SuffixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_TextBlockReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_TextBlockReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_TextBlockReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_TextBlockReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_UnaryExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_UnaryExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_collection_UnaryExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_collection_UnaryExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_next_CatchParameter.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_next_CatchParameter.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_next_CatchParameter.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_next_CatchParameter.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_next_OrdinaryParameter.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_next_OrdinaryParameter.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForEachLoop_next_OrdinaryParameter.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForEachLoop_next_OrdinaryParameter.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_init_ExpressionList.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_init_ExpressionList.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_init_ExpressionList.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_init_ExpressionList.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_init_LocalVariable.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_init_LocalVariable.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_init_LocalVariable.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_init_LocalVariable.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_AdditiveExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_AdditiveExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_AdditiveExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_AdditiveExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_AndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_AndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_AndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_AndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_ArrayConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_ArrayConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_ArrayConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_ArrayConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_ArrayInstantiationBySize.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_ArrayInstantiationBySize.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_ArrayInstantiationBySize.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_ArrayInstantiationBySize.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_ArrayInstantiationByValuesTyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_ArrayInstantiationByValuesTyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_ArrayInstantiationByValuesTyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_ArrayInstantiationByValuesTyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_ArrayInstantiationByValuesUntyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_ArrayInstantiationByValuesUntyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_ArrayInstantiationByValuesUntyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_ArrayInstantiationByValuesUntyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_AssignmentExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_AssignmentExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_AssignmentExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_AssignmentExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_BinaryIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_BinaryIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_BinaryIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_BinaryIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_BinaryLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_BinaryLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_BinaryLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_BinaryLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_BooleanLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_BooleanLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_BooleanLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_BooleanLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_CastExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_CastExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_CastExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_CastExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_CharacterLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_CharacterLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_CharacterLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_CharacterLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_ClassTypeConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_ClassTypeConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_ClassTypeConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_ClassTypeConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_ConditionalAndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_ConditionalAndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_ConditionalAndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_ConditionalAndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_ConditionalExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_ConditionalExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_ConditionalExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_ConditionalExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_ConditionalOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_ConditionalOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_ConditionalOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_ConditionalOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_DecimalDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_DecimalDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_DecimalDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_DecimalDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_DecimalFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_DecimalFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_DecimalFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_DecimalFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_DecimalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_DecimalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_DecimalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_DecimalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_DecimalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_DecimalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_DecimalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_DecimalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_EqualityExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_EqualityExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_EqualityExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_EqualityExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_ExclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_ExclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_ExclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_ExclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_ExplicitConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_ExplicitConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_ExplicitConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_ExplicitConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_HexDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_HexDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_HexDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_HexDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_HexFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_HexFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_HexFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_HexFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_HexIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_HexIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_HexIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_HexIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_HexLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_HexLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_HexLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_HexLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_InclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_InclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_InclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_InclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_InstanceOfExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_InstanceOfExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_InstanceOfExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_InstanceOfExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_LambdaExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_LambdaExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_LambdaExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_LambdaExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_MultiplicativeExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_MultiplicativeExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_MultiplicativeExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_MultiplicativeExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_NestedExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_NestedExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_NestedExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_NestedExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_NewConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_NewConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_NewConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_NewConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_NewConstructorCallWithInferredTypeArguments.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_NewConstructorCallWithInferredTypeArguments.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_NewConstructorCallWithInferredTypeArguments.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_NewConstructorCallWithInferredTypeArguments.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_NullLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_NullLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_NullLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_NullLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_OctalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_OctalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_OctalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_OctalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_OctalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_OctalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_OctalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_OctalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_PrefixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_PrefixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_PrefixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_PrefixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_PrimaryExpressionReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_PrimaryExpressionReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_PrimaryExpressionReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_PrimaryExpressionReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_PrimitiveTypeReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_PrimitiveTypeReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_PrimitiveTypeReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_PrimitiveTypeReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_ReflectiveClassReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_ReflectiveClassReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_ReflectiveClassReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_ReflectiveClassReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_RelationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_RelationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_RelationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_RelationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_SelfReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_SelfReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_SelfReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_SelfReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_ShiftExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_ShiftExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_ShiftExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_ShiftExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_StringReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_StringReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_StringReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_StringReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_SuffixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_SuffixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_SuffixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_SuffixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_TextBlockReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_TextBlockReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_TextBlockReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_TextBlockReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_UnaryExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_UnaryExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateForLoop_updates_UnaryExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateForLoop_updates_UnaryExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateImplementor_implements_Boolean.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateImplementor_implements_Boolean.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateImplementor_implements_Boolean.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateImplementor_implements_Boolean.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateImplementor_implements_Byte.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateImplementor_implements_Byte.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateImplementor_implements_Byte.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateImplementor_implements_Byte.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateImplementor_implements_Char.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateImplementor_implements_Char.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateImplementor_implements_Char.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateImplementor_implements_Char.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateImplementor_implements_ClassifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateImplementor_implements_ClassifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateImplementor_implements_ClassifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateImplementor_implements_ClassifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateImplementor_implements_Double.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateImplementor_implements_Double.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateImplementor_implements_Double.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateImplementor_implements_Double.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateImplementor_implements_Float.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateImplementor_implements_Float.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateImplementor_implements_Float.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateImplementor_implements_Float.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateImplementor_implements_InferableType.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateImplementor_implements_InferableType.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateImplementor_implements_InferableType.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateImplementor_implements_InferableType.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateImplementor_implements_Int.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateImplementor_implements_Int.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateImplementor_implements_Int.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateImplementor_implements_Int.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateImplementor_implements_Long.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateImplementor_implements_Long.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateImplementor_implements_Long.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateImplementor_implements_Long.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateImplementor_implements_NamespaceClassifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateImplementor_implements_NamespaceClassifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateImplementor_implements_NamespaceClassifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateImplementor_implements_NamespaceClassifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateImplementor_implements_Short.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateImplementor_implements_Short.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateImplementor_implements_Short.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateImplementor_implements_Short.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateImplementor_implements_Void.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateImplementor_implements_Void.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateImplementor_implements_Void.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateImplementor_implements_Void.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateImportingElement_imports_ClassifierImport.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateImportingElement_imports_ClassifierImport.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateImportingElement_imports_ClassifierImport.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateImportingElement_imports_ClassifierImport.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateImportingElement_imports_PackageImport.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateImportingElement_imports_PackageImport.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateImportingElement_imports_PackageImport.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateImportingElement_imports_PackageImport.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateImportingElement_imports_StaticClassifierImport.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateImportingElement_imports_StaticClassifierImport.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateImportingElement_imports_StaticClassifierImport.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateImportingElement_imports_StaticClassifierImport.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateImportingElement_imports_StaticMemberImport.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateImportingElement_imports_StaticMemberImport.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateImportingElement_imports_StaticMemberImport.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateImportingElement_imports_StaticMemberImport.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_AdditiveExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_AdditiveExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_AdditiveExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_AdditiveExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_AndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_AndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_AndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_AndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_ArrayConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_ArrayConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_ArrayConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_ArrayConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_ArrayInstantiationBySize.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_ArrayInstantiationBySize.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_ArrayInstantiationBySize.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_ArrayInstantiationBySize.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_ArrayInstantiationByValuesTyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_ArrayInstantiationByValuesTyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_ArrayInstantiationByValuesTyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_ArrayInstantiationByValuesTyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_ArrayInstantiationByValuesUntyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_ArrayInstantiationByValuesUntyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_ArrayInstantiationByValuesUntyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_ArrayInstantiationByValuesUntyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_BinaryIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_BinaryIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_BinaryIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_BinaryIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_BinaryLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_BinaryLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_BinaryLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_BinaryLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_BooleanLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_BooleanLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_BooleanLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_BooleanLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_CastExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_CastExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_CastExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_CastExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_CharacterLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_CharacterLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_CharacterLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_CharacterLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_ClassTypeConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_ClassTypeConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_ClassTypeConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_ClassTypeConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_DecimalDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_DecimalDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_DecimalDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_DecimalDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_DecimalFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_DecimalFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_DecimalFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_DecimalFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_DecimalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_DecimalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_DecimalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_DecimalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_DecimalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_DecimalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_DecimalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_DecimalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_EqualityExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_EqualityExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_EqualityExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_EqualityExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_ExclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_ExclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_ExclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_ExclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_ExplicitConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_ExplicitConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_ExplicitConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_ExplicitConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_HexDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_HexDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_HexDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_HexDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_HexFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_HexFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_HexFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_HexFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_HexIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_HexIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_HexIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_HexIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_HexLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_HexLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_HexLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_HexLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_InstanceOfExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_InstanceOfExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_InstanceOfExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_InstanceOfExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_MultiplicativeExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_MultiplicativeExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_MultiplicativeExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_MultiplicativeExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_NestedExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_NestedExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_NestedExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_NestedExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_NewConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_NewConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_NewConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_NewConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_NewConstructorCallWithInferredTypeArguments.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_NewConstructorCallWithInferredTypeArguments.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_NewConstructorCallWithInferredTypeArguments.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_NewConstructorCallWithInferredTypeArguments.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_NullLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_NullLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_NullLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_NullLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_OctalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_OctalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_OctalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_OctalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_OctalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_OctalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_OctalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_OctalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_PrefixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_PrefixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_PrefixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_PrefixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_PrimaryExpressionReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_PrimaryExpressionReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_PrimaryExpressionReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_PrimaryExpressionReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_PrimitiveTypeReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_PrimitiveTypeReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_PrimitiveTypeReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_PrimitiveTypeReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_ReflectiveClassReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_ReflectiveClassReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_ReflectiveClassReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_ReflectiveClassReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_RelationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_RelationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_RelationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_RelationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_SelfReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_SelfReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_SelfReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_SelfReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_ShiftExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_ShiftExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_ShiftExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_ShiftExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_StringReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_StringReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_StringReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_StringReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_SuffixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_SuffixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_SuffixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_SuffixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_TextBlockReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_TextBlockReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_TextBlockReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_TextBlockReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_UnaryExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_UnaryExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInclusiveOrExpression_children_UnaryExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInclusiveOrExpression_children_UnaryExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_AdditiveExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_AdditiveExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_AdditiveExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_AdditiveExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_AndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_AndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_AndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_AndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_ArrayConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_ArrayConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_ArrayConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_ArrayConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_ArrayInstantiationBySize.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_ArrayInstantiationBySize.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_ArrayInstantiationBySize.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_ArrayInstantiationBySize.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_ArrayInstantiationByValuesTyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_ArrayInstantiationByValuesTyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_ArrayInstantiationByValuesTyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_ArrayInstantiationByValuesTyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_ArrayInstantiationByValuesUntyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_ArrayInstantiationByValuesUntyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_ArrayInstantiationByValuesUntyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_ArrayInstantiationByValuesUntyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_AssignmentExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_AssignmentExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_AssignmentExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_AssignmentExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_BinaryIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_BinaryIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_BinaryIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_BinaryIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_BinaryLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_BinaryLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_BinaryLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_BinaryLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_BooleanLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_BooleanLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_BooleanLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_BooleanLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_CastExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_CastExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_CastExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_CastExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_CharacterLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_CharacterLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_CharacterLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_CharacterLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_ClassTypeConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_ClassTypeConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_ClassTypeConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_ClassTypeConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_ConditionalAndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_ConditionalAndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_ConditionalAndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_ConditionalAndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_ConditionalExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_ConditionalExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_ConditionalExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_ConditionalExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_ConditionalOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_ConditionalOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_ConditionalOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_ConditionalOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_DecimalDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_DecimalDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_DecimalDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_DecimalDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_DecimalFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_DecimalFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_DecimalFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_DecimalFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_DecimalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_DecimalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_DecimalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_DecimalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_DecimalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_DecimalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_DecimalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_DecimalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_EqualityExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_EqualityExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_EqualityExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_EqualityExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_ExclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_ExclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_ExclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_ExclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_ExplicitConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_ExplicitConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_ExplicitConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_ExplicitConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_HexDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_HexDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_HexDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_HexDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_HexFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_HexFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_HexFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_HexFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_HexIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_HexIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_HexIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_HexIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_HexLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_HexLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_HexLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_HexLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_InclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_InclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_InclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_InclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_InstanceOfExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_InstanceOfExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_InstanceOfExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_InstanceOfExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_LambdaExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_LambdaExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_LambdaExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_LambdaExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_MultiplicativeExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_MultiplicativeExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_MultiplicativeExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_MultiplicativeExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_NestedExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_NestedExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_NestedExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_NestedExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_NewConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_NewConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_NewConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_NewConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_NewConstructorCallWithInferredTypeArguments.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_NewConstructorCallWithInferredTypeArguments.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_NewConstructorCallWithInferredTypeArguments.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_NewConstructorCallWithInferredTypeArguments.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_NullLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_NullLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_NullLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_NullLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_OctalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_OctalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_OctalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_OctalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_OctalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_OctalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_OctalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_OctalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_PrefixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_PrefixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_PrefixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_PrefixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_PrimaryExpressionReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_PrimaryExpressionReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_PrimaryExpressionReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_PrimaryExpressionReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_PrimitiveTypeReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_PrimitiveTypeReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_PrimitiveTypeReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_PrimitiveTypeReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_ReflectiveClassReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_ReflectiveClassReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_ReflectiveClassReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_ReflectiveClassReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_RelationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_RelationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_RelationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_RelationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_SelfReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_SelfReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_SelfReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_SelfReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_ShiftExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_ShiftExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_ShiftExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_ShiftExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_StringReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_StringReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_StringReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_StringReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_SuffixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_SuffixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_SuffixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_SuffixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_TextBlockReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_TextBlockReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_TextBlockReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_TextBlockReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_UnaryExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_UnaryExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInitializable_initialValue_UnaryExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInitializable_initialValue_UnaryExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_AdditiveExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_AdditiveExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_AdditiveExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_AdditiveExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_ArrayConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_ArrayConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_ArrayConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_ArrayConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_ArrayInstantiationBySize.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_ArrayInstantiationBySize.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_ArrayInstantiationBySize.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_ArrayInstantiationBySize.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_ArrayInstantiationByValuesTyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_ArrayInstantiationByValuesTyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_ArrayInstantiationByValuesTyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_ArrayInstantiationByValuesTyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_ArrayInstantiationByValuesUntyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_ArrayInstantiationByValuesUntyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_ArrayInstantiationByValuesUntyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_ArrayInstantiationByValuesUntyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_BinaryIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_BinaryIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_BinaryIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_BinaryIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_BinaryLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_BinaryLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_BinaryLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_BinaryLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_BooleanLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_BooleanLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_BooleanLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_BooleanLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_CastExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_CastExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_CastExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_CastExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_CharacterLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_CharacterLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_CharacterLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_CharacterLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_ClassTypeConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_ClassTypeConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_ClassTypeConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_ClassTypeConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_DecimalDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_DecimalDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_DecimalDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_DecimalDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_DecimalFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_DecimalFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_DecimalFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_DecimalFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_DecimalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_DecimalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_DecimalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_DecimalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_DecimalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_DecimalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_DecimalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_DecimalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_ExplicitConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_ExplicitConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_ExplicitConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_ExplicitConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_HexDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_HexDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_HexDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_HexDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_HexFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_HexFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_HexFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_HexFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_HexIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_HexIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_HexIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_HexIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_HexLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_HexLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_HexLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_HexLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_MultiplicativeExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_MultiplicativeExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_MultiplicativeExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_MultiplicativeExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_NestedExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_NestedExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_NestedExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_NestedExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_NewConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_NewConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_NewConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_NewConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_NewConstructorCallWithInferredTypeArguments.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_NewConstructorCallWithInferredTypeArguments.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_NewConstructorCallWithInferredTypeArguments.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_NewConstructorCallWithInferredTypeArguments.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_NullLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_NullLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_NullLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_NullLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_OctalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_OctalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_OctalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_OctalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_OctalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_OctalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_OctalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_OctalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_PrefixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_PrefixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_PrefixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_PrefixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_PrimaryExpressionReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_PrimaryExpressionReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_PrimaryExpressionReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_PrimaryExpressionReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_PrimitiveTypeReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_PrimitiveTypeReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_PrimitiveTypeReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_PrimitiveTypeReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_ReflectiveClassReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_ReflectiveClassReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_ReflectiveClassReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_ReflectiveClassReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_RelationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_RelationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_RelationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_RelationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_SelfReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_SelfReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_SelfReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_SelfReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_ShiftExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_ShiftExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_ShiftExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_ShiftExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_StringReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_StringReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_StringReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_StringReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_SuffixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_SuffixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_SuffixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_SuffixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_TextBlockReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_TextBlockReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_TextBlockReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_TextBlockReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_UnaryExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_UnaryExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInstanceOfExpression_child_UnaryExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInstanceOfExpression_child_UnaryExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_AdditiveExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_AdditiveExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_AdditiveExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_AdditiveExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_AndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_AndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_AndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_AndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ArrayConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ArrayConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ArrayConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ArrayConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ArrayInitializer.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ArrayInitializer.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ArrayInitializer.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ArrayInitializer.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ArrayInstantiationBySize.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ArrayInstantiationBySize.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ArrayInstantiationBySize.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ArrayInstantiationBySize.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ArrayInstantiationByValuesTyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ArrayInstantiationByValuesTyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ArrayInstantiationByValuesTyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ArrayInstantiationByValuesTyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ArrayInstantiationByValuesUntyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ArrayInstantiationByValuesUntyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ArrayInstantiationByValuesUntyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ArrayInstantiationByValuesUntyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_BinaryIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_BinaryIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_BinaryIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_BinaryIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_BinaryLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_BinaryLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_BinaryLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_BinaryLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_BooleanLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_BooleanLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_BooleanLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_BooleanLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_CastExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_CastExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_CastExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_CastExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_CharacterLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_CharacterLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_CharacterLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_CharacterLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ClassTypeConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ClassTypeConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ClassTypeConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ClassTypeConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ConditionalAndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ConditionalAndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ConditionalAndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ConditionalAndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ConditionalExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ConditionalExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ConditionalExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ConditionalExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ConditionalOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ConditionalOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ConditionalOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ConditionalOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_DecimalDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_DecimalDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_DecimalDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_DecimalDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_DecimalFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_DecimalFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_DecimalFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_DecimalFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_DecimalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_DecimalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_DecimalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_DecimalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_DecimalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_DecimalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_DecimalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_DecimalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_EqualityExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_EqualityExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_EqualityExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_EqualityExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ExclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ExclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ExclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ExclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ExplicitConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ExplicitConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ExplicitConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ExplicitConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_HexDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_HexDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_HexDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_HexDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_HexFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_HexFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_HexFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_HexFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_HexIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_HexIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_HexIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_HexIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_HexLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_HexLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_HexLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_HexLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_InclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_InclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_InclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_InclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_InstanceOfExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_InstanceOfExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_InstanceOfExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_InstanceOfExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_MultiplicativeExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_MultiplicativeExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_MultiplicativeExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_MultiplicativeExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_NestedExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_NestedExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_NestedExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_NestedExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_NewConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_NewConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_NewConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_NewConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_NewConstructorCallWithInferredTypeArguments.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_NewConstructorCallWithInferredTypeArguments.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_NewConstructorCallWithInferredTypeArguments.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_NewConstructorCallWithInferredTypeArguments.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_NullLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_NullLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_NullLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_NullLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_OctalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_OctalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_OctalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_OctalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_OctalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_OctalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_OctalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_OctalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_PrefixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_PrefixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_PrefixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_PrefixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_PrimaryExpressionReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_PrimaryExpressionReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_PrimaryExpressionReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_PrimaryExpressionReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_PrimitiveTypeReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_PrimitiveTypeReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_PrimitiveTypeReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_PrimitiveTypeReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ReflectiveClassReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ReflectiveClassReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ReflectiveClassReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ReflectiveClassReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_RelationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_RelationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_RelationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_RelationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_SelfReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_SelfReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_SelfReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_SelfReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ShiftExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ShiftExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ShiftExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_ShiftExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_StringReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_StringReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_StringReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_StringReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_SuffixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_SuffixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_SuffixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_SuffixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_TextBlockReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_TextBlockReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_TextBlockReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_TextBlockReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_UnaryExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_UnaryExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterfaceMethod_defaultValue_UnaryExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterfaceMethod_defaultValue_UnaryExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterface_extends_Boolean.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterface_extends_Boolean.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterface_extends_Boolean.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterface_extends_Boolean.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterface_extends_Byte.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterface_extends_Byte.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterface_extends_Byte.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterface_extends_Byte.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterface_extends_Char.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterface_extends_Char.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterface_extends_Char.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterface_extends_Char.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterface_extends_ClassifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterface_extends_ClassifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterface_extends_ClassifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterface_extends_ClassifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterface_extends_Double.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterface_extends_Double.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterface_extends_Double.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterface_extends_Double.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterface_extends_Float.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterface_extends_Float.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterface_extends_Float.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterface_extends_Float.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterface_extends_InferableType.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterface_extends_InferableType.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterface_extends_InferableType.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterface_extends_InferableType.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterface_extends_Int.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterface_extends_Int.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterface_extends_Int.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterface_extends_Int.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterface_extends_Long.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterface_extends_Long.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterface_extends_Long.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterface_extends_Long.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterface_extends_NamespaceClassifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterface_extends_NamespaceClassifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterface_extends_NamespaceClassifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterface_extends_NamespaceClassifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterface_extends_Short.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterface_extends_Short.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterface_extends_Short.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterface_extends_Short.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterface_extends_Void.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterface_extends_Void.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateInterface_extends_Void.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateInterface_extends_Void.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_AdditiveExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_AdditiveExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_AdditiveExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_AdditiveExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_AndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_AndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_AndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_AndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_ArrayConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_ArrayConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_ArrayConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_ArrayConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_ArrayInstantiationBySize.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_ArrayInstantiationBySize.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_ArrayInstantiationBySize.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_ArrayInstantiationBySize.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_ArrayInstantiationByValuesTyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_ArrayInstantiationByValuesTyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_ArrayInstantiationByValuesTyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_ArrayInstantiationByValuesTyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_ArrayInstantiationByValuesUntyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_ArrayInstantiationByValuesUntyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_ArrayInstantiationByValuesUntyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_ArrayInstantiationByValuesUntyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_AssignmentExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_AssignmentExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_AssignmentExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_AssignmentExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_BinaryIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_BinaryIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_BinaryIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_BinaryIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_BinaryLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_BinaryLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_BinaryLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_BinaryLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_Block.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_Block.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_Block.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_Block.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_BooleanLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_BooleanLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_BooleanLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_BooleanLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_CastExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_CastExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_CastExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_CastExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_CharacterLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_CharacterLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_CharacterLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_CharacterLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_ClassTypeConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_ClassTypeConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_ClassTypeConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_ClassTypeConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_ConditionalAndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_ConditionalAndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_ConditionalAndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_ConditionalAndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_ConditionalExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_ConditionalExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_ConditionalExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_ConditionalExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_ConditionalOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_ConditionalOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_ConditionalOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_ConditionalOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_DecimalDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_DecimalDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_DecimalDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_DecimalDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_DecimalFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_DecimalFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_DecimalFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_DecimalFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_DecimalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_DecimalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_DecimalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_DecimalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_DecimalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_DecimalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_DecimalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_DecimalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_EqualityExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_EqualityExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_EqualityExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_EqualityExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_ExclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_ExclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_ExclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_ExclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_ExplicitConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_ExplicitConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_ExplicitConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_ExplicitConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_HexDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_HexDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_HexDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_HexDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_HexFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_HexFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_HexFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_HexFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_HexIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_HexIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_HexIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_HexIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_HexLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_HexLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_HexLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_HexLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_InclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_InclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_InclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_InclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_InstanceOfExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_InstanceOfExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_InstanceOfExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_InstanceOfExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_LambdaExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_LambdaExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_LambdaExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_LambdaExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_MultiplicativeExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_MultiplicativeExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_MultiplicativeExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_MultiplicativeExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_NestedExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_NestedExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_NestedExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_NestedExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_NewConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_NewConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_NewConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_NewConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_NewConstructorCallWithInferredTypeArguments.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_NewConstructorCallWithInferredTypeArguments.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_NewConstructorCallWithInferredTypeArguments.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_NewConstructorCallWithInferredTypeArguments.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_NullLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_NullLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_NullLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_NullLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_OctalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_OctalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_OctalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_OctalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_OctalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_OctalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_OctalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_OctalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_PrefixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_PrefixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_PrefixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_PrefixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_PrimaryExpressionReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_PrimaryExpressionReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_PrimaryExpressionReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_PrimaryExpressionReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_PrimitiveTypeReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_PrimitiveTypeReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_PrimitiveTypeReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_PrimitiveTypeReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_ReflectiveClassReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_ReflectiveClassReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_ReflectiveClassReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_ReflectiveClassReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_RelationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_RelationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_RelationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_RelationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_SelfReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_SelfReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_SelfReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_SelfReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_ShiftExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_ShiftExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_ShiftExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_ShiftExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_StringReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_StringReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_StringReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_StringReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_SuffixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_SuffixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_SuffixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_SuffixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_TextBlockReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_TextBlockReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_TextBlockReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_TextBlockReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_UnaryExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_UnaryExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_body_UnaryExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_body_UnaryExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_parameters_ExplicitlyTypedLambdaParameters.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_parameters_ExplicitlyTypedLambdaParameters.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_parameters_ExplicitlyTypedLambdaParameters.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_parameters_ExplicitlyTypedLambdaParameters.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_parameters_ImplicitlyTypedLambdaParameters.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_parameters_ImplicitlyTypedLambdaParameters.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_parameters_ImplicitlyTypedLambdaParameters.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_parameters_ImplicitlyTypedLambdaParameters.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_parameters_SingleImplicitLambdaParameter.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_parameters_SingleImplicitLambdaParameter.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLambdaExpression_parameters_SingleImplicitLambdaParameter.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLambdaExpression_parameters_SingleImplicitLambdaParameter.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLocalVariableStatement_variable_LocalVariable.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLocalVariableStatement_variable_LocalVariable.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLocalVariableStatement_variable_LocalVariable.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLocalVariableStatement_variable_LocalVariable.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLocalVariable_additionalLocalVariables_AdditionalLocalVariable.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLocalVariable_additionalLocalVariables_AdditionalLocalVariable.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateLocalVariable_additionalLocalVariables_AdditionalLocalVariable.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateLocalVariable_additionalLocalVariables_AdditionalLocalVariable.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMemberContainer_defaultMembers_Annotation.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMemberContainer_defaultMembers_Annotation.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMemberContainer_defaultMembers_Annotation.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMemberContainer_defaultMembers_Annotation.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMemberContainer_defaultMembers_Block.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMemberContainer_defaultMembers_Block.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMemberContainer_defaultMembers_Block.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMemberContainer_defaultMembers_Block.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMemberContainer_defaultMembers_Class.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMemberContainer_defaultMembers_Class.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMemberContainer_defaultMembers_Class.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMemberContainer_defaultMembers_Class.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMemberContainer_defaultMembers_ClassMethod.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMemberContainer_defaultMembers_ClassMethod.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMemberContainer_defaultMembers_ClassMethod.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMemberContainer_defaultMembers_ClassMethod.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMemberContainer_defaultMembers_Constructor.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMemberContainer_defaultMembers_Constructor.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMemberContainer_defaultMembers_Constructor.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMemberContainer_defaultMembers_Constructor.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMemberContainer_defaultMembers_EmptyMember.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMemberContainer_defaultMembers_EmptyMember.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMemberContainer_defaultMembers_EmptyMember.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMemberContainer_defaultMembers_EmptyMember.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMemberContainer_defaultMembers_Enumeration.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMemberContainer_defaultMembers_Enumeration.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMemberContainer_defaultMembers_Enumeration.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMemberContainer_defaultMembers_Enumeration.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMemberContainer_defaultMembers_Field.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMemberContainer_defaultMembers_Field.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMemberContainer_defaultMembers_Field.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMemberContainer_defaultMembers_Field.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMemberContainer_defaultMembers_Interface.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMemberContainer_defaultMembers_Interface.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMemberContainer_defaultMembers_Interface.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMemberContainer_defaultMembers_Interface.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMemberContainer_defaultMembers_InterfaceMethod.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMemberContainer_defaultMembers_InterfaceMethod.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMemberContainer_defaultMembers_InterfaceMethod.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMemberContainer_defaultMembers_InterfaceMethod.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMemberContainer_members_Annotation.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMemberContainer_members_Annotation.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMemberContainer_members_Annotation.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMemberContainer_members_Annotation.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMemberContainer_members_Block.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMemberContainer_members_Block.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMemberContainer_members_Block.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMemberContainer_members_Block.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMemberContainer_members_Class.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMemberContainer_members_Class.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMemberContainer_members_Class.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMemberContainer_members_Class.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMemberContainer_members_ClassMethod.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMemberContainer_members_ClassMethod.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMemberContainer_members_ClassMethod.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMemberContainer_members_ClassMethod.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMemberContainer_members_Constructor.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMemberContainer_members_Constructor.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMemberContainer_members_Constructor.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMemberContainer_members_Constructor.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMemberContainer_members_EmptyMember.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMemberContainer_members_EmptyMember.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMemberContainer_members_EmptyMember.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMemberContainer_members_EmptyMember.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMemberContainer_members_Enumeration.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMemberContainer_members_Enumeration.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMemberContainer_members_Enumeration.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMemberContainer_members_Enumeration.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMemberContainer_members_Field.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMemberContainer_members_Field.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMemberContainer_members_Field.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMemberContainer_members_Field.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMemberContainer_members_Interface.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMemberContainer_members_Interface.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMemberContainer_members_Interface.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMemberContainer_members_Interface.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMemberContainer_members_InterfaceMethod.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMemberContainer_members_InterfaceMethod.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMemberContainer_members_InterfaceMethod.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMemberContainer_members_InterfaceMethod.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateModifiable_modifiers_Abstract.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateModifiable_modifiers_Abstract.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateModifiable_modifiers_Abstract.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateModifiable_modifiers_Abstract.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateModifiable_modifiers_Default.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateModifiable_modifiers_Default.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateModifiable_modifiers_Default.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateModifiable_modifiers_Default.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateModifiable_modifiers_Final.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateModifiable_modifiers_Final.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateModifiable_modifiers_Final.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateModifiable_modifiers_Final.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateModifiable_modifiers_Native.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateModifiable_modifiers_Native.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateModifiable_modifiers_Native.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateModifiable_modifiers_Native.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateModifiable_modifiers_Private.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateModifiable_modifiers_Private.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateModifiable_modifiers_Private.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateModifiable_modifiers_Private.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateModifiable_modifiers_Protected.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateModifiable_modifiers_Protected.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateModifiable_modifiers_Protected.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateModifiable_modifiers_Protected.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateModifiable_modifiers_Public.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateModifiable_modifiers_Public.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateModifiable_modifiers_Public.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateModifiable_modifiers_Public.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateModifiable_modifiers_Static.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateModifiable_modifiers_Static.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateModifiable_modifiers_Static.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateModifiable_modifiers_Static.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateModifiable_modifiers_Strictfp.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateModifiable_modifiers_Strictfp.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateModifiable_modifiers_Strictfp.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateModifiable_modifiers_Strictfp.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateModifiable_modifiers_Synchronized.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateModifiable_modifiers_Synchronized.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateModifiable_modifiers_Synchronized.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateModifiable_modifiers_Synchronized.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateModifiable_modifiers_Transient.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateModifiable_modifiers_Transient.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateModifiable_modifiers_Transient.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateModifiable_modifiers_Transient.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateModifiable_modifiers_Volatile.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateModifiable_modifiers_Volatile.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateModifiable_modifiers_Volatile.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateModifiable_modifiers_Volatile.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateModuleReference_target_Module.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateModuleReference_target_Module.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateModuleReference_target_Module.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateModuleReference_target_Module.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateModule_open_Open.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateModule_open_Open.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateModule_open_Open.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateModule_open_Open.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateModule_packages_Package.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateModule_packages_Package.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateModule_packages_Package.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateModule_packages_Package.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateModule_target_ExportsModuleDirective.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateModule_target_ExportsModuleDirective.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateModule_target_ExportsModuleDirective.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateModule_target_ExportsModuleDirective.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateModule_target_OpensModuleDirective.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateModule_target_OpensModuleDirective.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateModule_target_OpensModuleDirective.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateModule_target_OpensModuleDirective.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateModule_target_ProvidesModuleDirective.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateModule_target_ProvidesModuleDirective.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateModule_target_ProvidesModuleDirective.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateModule_target_ProvidesModuleDirective.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateModule_target_RequiresModuleDirective.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateModule_target_RequiresModuleDirective.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateModule_target_RequiresModuleDirective.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateModule_target_RequiresModuleDirective.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateModule_target_UsesModuleDirective.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateModule_target_UsesModuleDirective.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateModule_target_UsesModuleDirective.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateModule_target_UsesModuleDirective.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_ArrayConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_ArrayConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_ArrayConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_ArrayConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_ArrayInstantiationBySize.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_ArrayInstantiationBySize.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_ArrayInstantiationBySize.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_ArrayInstantiationBySize.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_ArrayInstantiationByValuesTyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_ArrayInstantiationByValuesTyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_ArrayInstantiationByValuesTyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_ArrayInstantiationByValuesTyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_ArrayInstantiationByValuesUntyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_ArrayInstantiationByValuesUntyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_ArrayInstantiationByValuesUntyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_ArrayInstantiationByValuesUntyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_BinaryIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_BinaryIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_BinaryIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_BinaryIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_BinaryLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_BinaryLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_BinaryLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_BinaryLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_BooleanLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_BooleanLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_BooleanLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_BooleanLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_CastExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_CastExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_CastExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_CastExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_CharacterLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_CharacterLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_CharacterLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_CharacterLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_ClassTypeConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_ClassTypeConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_ClassTypeConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_ClassTypeConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_DecimalDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_DecimalDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_DecimalDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_DecimalDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_DecimalFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_DecimalFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_DecimalFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_DecimalFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_DecimalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_DecimalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_DecimalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_DecimalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_DecimalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_DecimalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_DecimalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_DecimalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_ExplicitConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_ExplicitConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_ExplicitConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_ExplicitConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_HexDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_HexDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_HexDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_HexDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_HexFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_HexFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_HexFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_HexFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_HexIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_HexIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_HexIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_HexIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_HexLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_HexLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_HexLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_HexLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_NestedExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_NestedExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_NestedExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_NestedExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_NewConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_NewConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_NewConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_NewConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_NewConstructorCallWithInferredTypeArguments.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_NewConstructorCallWithInferredTypeArguments.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_NewConstructorCallWithInferredTypeArguments.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_NewConstructorCallWithInferredTypeArguments.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_NullLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_NullLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_NullLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_NullLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_OctalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_OctalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_OctalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_OctalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_OctalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_OctalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_OctalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_OctalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_PrefixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_PrefixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_PrefixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_PrefixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_PrimaryExpressionReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_PrimaryExpressionReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_PrimaryExpressionReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_PrimaryExpressionReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_PrimitiveTypeReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_PrimitiveTypeReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_PrimitiveTypeReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_PrimitiveTypeReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_ReflectiveClassReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_ReflectiveClassReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_ReflectiveClassReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_ReflectiveClassReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_SelfReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_SelfReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_SelfReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_SelfReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_StringReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_StringReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_StringReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_StringReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_SuffixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_SuffixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_SuffixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_SuffixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_TextBlockReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_TextBlockReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_TextBlockReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_TextBlockReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_UnaryExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_UnaryExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_children_UnaryExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_children_UnaryExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_multiplicativeOperators_Division.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_multiplicativeOperators_Division.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_multiplicativeOperators_Division.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_multiplicativeOperators_Division.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_multiplicativeOperators_Multiplication.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_multiplicativeOperators_Multiplication.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_multiplicativeOperators_Multiplication.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_multiplicativeOperators_Multiplication.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_multiplicativeOperators_Remainder.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_multiplicativeOperators_Remainder.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateMultiplicativeExpression_multiplicativeOperators_Remainder.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateMultiplicativeExpression_multiplicativeOperators_Remainder.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNamespaceClassifierReference_classifierReferences_ClassifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNamespaceClassifierReference_classifierReferences_ClassifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNamespaceClassifierReference_classifierReferences_ClassifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNamespaceClassifierReference_classifierReferences_ClassifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_AdditiveExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_AdditiveExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_AdditiveExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_AdditiveExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_AndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_AndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_AndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_AndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_ArrayConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_ArrayConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_ArrayConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_ArrayConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_ArrayInstantiationBySize.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_ArrayInstantiationBySize.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_ArrayInstantiationBySize.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_ArrayInstantiationBySize.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_ArrayInstantiationByValuesTyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_ArrayInstantiationByValuesTyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_ArrayInstantiationByValuesTyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_ArrayInstantiationByValuesTyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_ArrayInstantiationByValuesUntyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_ArrayInstantiationByValuesUntyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_ArrayInstantiationByValuesUntyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_ArrayInstantiationByValuesUntyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_AssignmentExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_AssignmentExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_AssignmentExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_AssignmentExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_BinaryIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_BinaryIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_BinaryIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_BinaryIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_BinaryLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_BinaryLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_BinaryLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_BinaryLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_BooleanLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_BooleanLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_BooleanLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_BooleanLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_CastExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_CastExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_CastExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_CastExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_CharacterLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_CharacterLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_CharacterLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_CharacterLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_ClassTypeConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_ClassTypeConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_ClassTypeConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_ClassTypeConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_ConditionalAndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_ConditionalAndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_ConditionalAndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_ConditionalAndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_ConditionalExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_ConditionalExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_ConditionalExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_ConditionalExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_ConditionalOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_ConditionalOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_ConditionalOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_ConditionalOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_DecimalDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_DecimalDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_DecimalDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_DecimalDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_DecimalFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_DecimalFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_DecimalFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_DecimalFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_DecimalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_DecimalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_DecimalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_DecimalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_DecimalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_DecimalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_DecimalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_DecimalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_EqualityExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_EqualityExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_EqualityExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_EqualityExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_ExclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_ExclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_ExclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_ExclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_ExplicitConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_ExplicitConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_ExplicitConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_ExplicitConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_HexDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_HexDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_HexDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_HexDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_HexFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_HexFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_HexFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_HexFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_HexIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_HexIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_HexIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_HexIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_HexLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_HexLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_HexLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_HexLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_InclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_InclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_InclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_InclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_InstanceOfExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_InstanceOfExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_InstanceOfExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_InstanceOfExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_LambdaExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_LambdaExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_LambdaExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_LambdaExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_MultiplicativeExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_MultiplicativeExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_MultiplicativeExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_MultiplicativeExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_NestedExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_NestedExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_NestedExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_NestedExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_NewConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_NewConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_NewConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_NewConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_NewConstructorCallWithInferredTypeArguments.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_NewConstructorCallWithInferredTypeArguments.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_NewConstructorCallWithInferredTypeArguments.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_NewConstructorCallWithInferredTypeArguments.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_NullLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_NullLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_NullLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_NullLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_OctalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_OctalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_OctalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_OctalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_OctalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_OctalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_OctalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_OctalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_PrefixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_PrefixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_PrefixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_PrefixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_PrimaryExpressionReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_PrimaryExpressionReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_PrimaryExpressionReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_PrimaryExpressionReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_PrimitiveTypeReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_PrimitiveTypeReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_PrimitiveTypeReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_PrimitiveTypeReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_ReflectiveClassReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_ReflectiveClassReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_ReflectiveClassReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_ReflectiveClassReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_RelationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_RelationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_RelationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_RelationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_SelfReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_SelfReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_SelfReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_SelfReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_ShiftExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_ShiftExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_ShiftExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_ShiftExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_StringReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_StringReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_StringReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_StringReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_SuffixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_SuffixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_SuffixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_SuffixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_TextBlockReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_TextBlockReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_TextBlockReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_TextBlockReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_UnaryExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_UnaryExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNestedExpression_expression_UnaryExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNestedExpression_expression_UnaryExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNewConstructorCall_anonymousClass_AnonymousClass.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNewConstructorCall_anonymousClass_AnonymousClass.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNewConstructorCall_anonymousClass_AnonymousClass.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNewConstructorCall_anonymousClass_AnonymousClass.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_AdditiveExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_AdditiveExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_AdditiveExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_AdditiveExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_AndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_AndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_AndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_AndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ArrayConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ArrayConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ArrayConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ArrayConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ArrayInstantiationBySize.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ArrayInstantiationBySize.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ArrayInstantiationBySize.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ArrayInstantiationBySize.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ArrayInstantiationByValuesTyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ArrayInstantiationByValuesTyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ArrayInstantiationByValuesTyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ArrayInstantiationByValuesTyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ArrayInstantiationByValuesUntyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ArrayInstantiationByValuesUntyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ArrayInstantiationByValuesUntyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ArrayInstantiationByValuesUntyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_AssignmentExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_AssignmentExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_AssignmentExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_AssignmentExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_BinaryIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_BinaryIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_BinaryIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_BinaryIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_BinaryLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_BinaryLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_BinaryLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_BinaryLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_BooleanLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_BooleanLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_BooleanLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_BooleanLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_CastExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_CastExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_CastExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_CastExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_CharacterLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_CharacterLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_CharacterLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_CharacterLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ClassTypeConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ClassTypeConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ClassTypeConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ClassTypeConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ConditionalAndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ConditionalAndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ConditionalAndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ConditionalAndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ConditionalExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ConditionalExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ConditionalExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ConditionalExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ConditionalOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ConditionalOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ConditionalOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ConditionalOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_DecimalDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_DecimalDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_DecimalDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_DecimalDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_DecimalFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_DecimalFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_DecimalFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_DecimalFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_DecimalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_DecimalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_DecimalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_DecimalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_DecimalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_DecimalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_DecimalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_DecimalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_EqualityExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_EqualityExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_EqualityExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_EqualityExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ExclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ExclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ExclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ExclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ExplicitConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ExplicitConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ExplicitConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ExplicitConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_HexDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_HexDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_HexDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_HexDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_HexFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_HexFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_HexFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_HexFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_HexIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_HexIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_HexIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_HexIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_HexLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_HexLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_HexLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_HexLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_InclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_InclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_InclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_InclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_InstanceOfExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_InstanceOfExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_InstanceOfExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_InstanceOfExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_LambdaExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_LambdaExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_LambdaExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_LambdaExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_MultiplicativeExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_MultiplicativeExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_MultiplicativeExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_MultiplicativeExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_NestedExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_NestedExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_NestedExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_NestedExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_NewConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_NewConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_NewConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_NewConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_NewConstructorCallWithInferredTypeArguments.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_NewConstructorCallWithInferredTypeArguments.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_NewConstructorCallWithInferredTypeArguments.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_NewConstructorCallWithInferredTypeArguments.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_NullLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_NullLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_NullLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_NullLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_OctalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_OctalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_OctalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_OctalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_OctalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_OctalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_OctalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_OctalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_PrefixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_PrefixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_PrefixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_PrefixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_PrimaryExpressionReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_PrimaryExpressionReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_PrimaryExpressionReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_PrimaryExpressionReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_PrimitiveTypeReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_PrimitiveTypeReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_PrimitiveTypeReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_PrimitiveTypeReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ReflectiveClassReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ReflectiveClassReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ReflectiveClassReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ReflectiveClassReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_RelationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_RelationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_RelationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_RelationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_SelfReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_SelfReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_SelfReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_SelfReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ShiftExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ShiftExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ShiftExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_ShiftExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_StringReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_StringReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_StringReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_StringReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_SuffixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_SuffixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_SuffixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_SuffixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_TextBlockReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_TextBlockReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_TextBlockReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_TextBlockReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_UnaryExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_UnaryExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_UnaryExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchCase_additionalConditions_UnaryExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_AdditiveExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_AdditiveExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_AdditiveExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_AdditiveExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_AndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_AndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_AndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_AndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ArrayConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ArrayConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ArrayConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ArrayConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ArrayInstantiationBySize.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ArrayInstantiationBySize.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ArrayInstantiationBySize.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ArrayInstantiationBySize.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ArrayInstantiationByValuesTyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ArrayInstantiationByValuesTyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ArrayInstantiationByValuesTyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ArrayInstantiationByValuesTyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ArrayInstantiationByValuesUntyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ArrayInstantiationByValuesUntyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ArrayInstantiationByValuesUntyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ArrayInstantiationByValuesUntyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_AssignmentExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_AssignmentExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_AssignmentExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_AssignmentExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_BinaryIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_BinaryIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_BinaryIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_BinaryIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_BinaryLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_BinaryLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_BinaryLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_BinaryLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_BooleanLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_BooleanLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_BooleanLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_BooleanLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_CastExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_CastExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_CastExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_CastExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_CharacterLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_CharacterLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_CharacterLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_CharacterLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ClassTypeConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ClassTypeConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ClassTypeConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ClassTypeConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ConditionalAndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ConditionalAndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ConditionalAndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ConditionalAndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ConditionalExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ConditionalExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ConditionalExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ConditionalExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ConditionalOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ConditionalOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ConditionalOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ConditionalOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_DecimalDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_DecimalDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_DecimalDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_DecimalDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_DecimalFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_DecimalFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_DecimalFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_DecimalFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_DecimalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_DecimalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_DecimalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_DecimalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_DecimalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_DecimalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_DecimalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_DecimalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_EqualityExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_EqualityExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_EqualityExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_EqualityExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ExclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ExclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ExclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ExclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ExplicitConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ExplicitConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ExplicitConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ExplicitConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_HexDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_HexDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_HexDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_HexDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_HexFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_HexFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_HexFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_HexFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_HexIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_HexIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_HexIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_HexIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_HexLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_HexLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_HexLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_HexLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_InclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_InclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_InclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_InclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_InstanceOfExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_InstanceOfExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_InstanceOfExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_InstanceOfExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_LambdaExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_LambdaExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_LambdaExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_LambdaExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_MultiplicativeExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_MultiplicativeExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_MultiplicativeExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_MultiplicativeExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_NestedExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_NestedExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_NestedExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_NestedExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_NewConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_NewConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_NewConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_NewConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_NewConstructorCallWithInferredTypeArguments.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_NewConstructorCallWithInferredTypeArguments.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_NewConstructorCallWithInferredTypeArguments.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_NewConstructorCallWithInferredTypeArguments.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_NullLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_NullLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_NullLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_NullLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_OctalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_OctalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_OctalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_OctalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_OctalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_OctalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_OctalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_OctalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_PrefixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_PrefixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_PrefixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_PrefixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_PrimaryExpressionReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_PrimaryExpressionReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_PrimaryExpressionReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_PrimaryExpressionReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_PrimitiveTypeReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_PrimitiveTypeReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_PrimitiveTypeReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_PrimitiveTypeReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ReflectiveClassReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ReflectiveClassReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ReflectiveClassReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ReflectiveClassReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_RelationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_RelationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_RelationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_RelationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_SelfReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_SelfReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_SelfReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_SelfReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ShiftExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ShiftExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ShiftExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_ShiftExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_StringReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_StringReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_StringReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_StringReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_SuffixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_SuffixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_SuffixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_SuffixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_TextBlockReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_TextBlockReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_TextBlockReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_TextBlockReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_UnaryExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_UnaryExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_UnaryExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateNormalSwitchRule_additionalConditions_UnaryExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePackage_classifiers_Annotation.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePackage_classifiers_Annotation.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePackage_classifiers_Annotation.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePackage_classifiers_Annotation.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePackage_classifiers_Class.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePackage_classifiers_Class.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePackage_classifiers_Class.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePackage_classifiers_Class.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePackage_classifiers_Enumeration.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePackage_classifiers_Enumeration.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePackage_classifiers_Enumeration.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePackage_classifiers_Enumeration.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePackage_classifiers_Interface.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePackage_classifiers_Interface.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePackage_classifiers_Interface.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePackage_classifiers_Interface.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateParametrizable_parameters_CatchParameter.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateParametrizable_parameters_CatchParameter.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateParametrizable_parameters_CatchParameter.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateParametrizable_parameters_CatchParameter.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateParametrizable_parameters_OrdinaryParameter.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateParametrizable_parameters_OrdinaryParameter.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateParametrizable_parameters_OrdinaryParameter.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateParametrizable_parameters_OrdinaryParameter.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateParametrizable_parameters_ReceiverParameter.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateParametrizable_parameters_ReceiverParameter.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateParametrizable_parameters_ReceiverParameter.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateParametrizable_parameters_ReceiverParameter.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateParametrizable_parameters_VariableLengthParameter.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateParametrizable_parameters_VariableLengthParameter.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateParametrizable_parameters_VariableLengthParameter.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateParametrizable_parameters_VariableLengthParameter.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_ArrayInstantiationBySize.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_ArrayInstantiationBySize.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_ArrayInstantiationBySize.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_ArrayInstantiationBySize.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_ArrayInstantiationByValuesTyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_ArrayInstantiationByValuesTyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_ArrayInstantiationByValuesTyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_ArrayInstantiationByValuesTyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_ArrayInstantiationByValuesUntyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_ArrayInstantiationByValuesUntyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_ArrayInstantiationByValuesUntyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_ArrayInstantiationByValuesUntyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_BinaryIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_BinaryIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_BinaryIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_BinaryIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_BinaryLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_BinaryLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_BinaryLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_BinaryLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_BooleanLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_BooleanLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_BooleanLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_BooleanLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_CharacterLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_CharacterLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_CharacterLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_CharacterLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_DecimalDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_DecimalDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_DecimalDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_DecimalDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_DecimalFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_DecimalFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_DecimalFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_DecimalFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_DecimalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_DecimalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_DecimalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_DecimalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_DecimalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_DecimalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_DecimalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_DecimalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_ExplicitConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_ExplicitConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_ExplicitConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_ExplicitConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_HexDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_HexDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_HexDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_HexDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_HexFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_HexFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_HexFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_HexFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_HexIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_HexIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_HexIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_HexIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_HexLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_HexLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_HexLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_HexLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_NestedExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_NestedExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_NestedExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_NestedExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_NewConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_NewConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_NewConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_NewConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_NewConstructorCallWithInferredTypeArguments.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_NewConstructorCallWithInferredTypeArguments.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_NewConstructorCallWithInferredTypeArguments.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_NewConstructorCallWithInferredTypeArguments.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_NullLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_NullLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_NullLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_NullLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_OctalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_OctalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_OctalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_OctalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_OctalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_OctalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_OctalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_OctalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_PrimitiveTypeReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_PrimitiveTypeReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_PrimitiveTypeReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_PrimitiveTypeReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_ReflectiveClassReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_ReflectiveClassReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_ReflectiveClassReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_ReflectiveClassReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_SelfReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_SelfReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_SelfReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_SelfReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_StringReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_StringReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_StringReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_StringReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_TextBlockReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_TextBlockReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_TextBlockReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_child_TextBlockReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_ArrayInstantiationBySize.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_ArrayInstantiationBySize.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_ArrayInstantiationBySize.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_ArrayInstantiationBySize.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_ArrayInstantiationByValuesTyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_ArrayInstantiationByValuesTyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_ArrayInstantiationByValuesTyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_ArrayInstantiationByValuesTyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_ArrayInstantiationByValuesUntyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_ArrayInstantiationByValuesUntyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_ArrayInstantiationByValuesUntyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_ArrayInstantiationByValuesUntyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_ExplicitConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_ExplicitConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_ExplicitConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_ExplicitConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_NestedExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_NestedExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_NestedExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_NestedExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_NewConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_NewConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_NewConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_NewConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_NewConstructorCallWithInferredTypeArguments.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_NewConstructorCallWithInferredTypeArguments.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_NewConstructorCallWithInferredTypeArguments.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_NewConstructorCallWithInferredTypeArguments.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_PrimitiveTypeReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_PrimitiveTypeReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_PrimitiveTypeReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_PrimitiveTypeReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_ReflectiveClassReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_ReflectiveClassReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_ReflectiveClassReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_ReflectiveClassReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_SelfReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_SelfReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_SelfReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_SelfReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_StringReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_StringReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_StringReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_StringReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_TextBlockReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_TextBlockReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_TextBlockReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimaryExpressionReferenceExpression_methodReference_TextBlockReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimitiveTypeReference_primitiveType_Boolean.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimitiveTypeReference_primitiveType_Boolean.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimitiveTypeReference_primitiveType_Boolean.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimitiveTypeReference_primitiveType_Boolean.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimitiveTypeReference_primitiveType_Byte.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimitiveTypeReference_primitiveType_Byte.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimitiveTypeReference_primitiveType_Byte.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimitiveTypeReference_primitiveType_Byte.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimitiveTypeReference_primitiveType_Char.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimitiveTypeReference_primitiveType_Char.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimitiveTypeReference_primitiveType_Char.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimitiveTypeReference_primitiveType_Char.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimitiveTypeReference_primitiveType_Double.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimitiveTypeReference_primitiveType_Double.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimitiveTypeReference_primitiveType_Double.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimitiveTypeReference_primitiveType_Double.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimitiveTypeReference_primitiveType_Float.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimitiveTypeReference_primitiveType_Float.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimitiveTypeReference_primitiveType_Float.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimitiveTypeReference_primitiveType_Float.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimitiveTypeReference_primitiveType_Int.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimitiveTypeReference_primitiveType_Int.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimitiveTypeReference_primitiveType_Int.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimitiveTypeReference_primitiveType_Int.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimitiveTypeReference_primitiveType_Long.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimitiveTypeReference_primitiveType_Long.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimitiveTypeReference_primitiveType_Long.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimitiveTypeReference_primitiveType_Long.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimitiveTypeReference_primitiveType_Short.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimitiveTypeReference_primitiveType_Short.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimitiveTypeReference_primitiveType_Short.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimitiveTypeReference_primitiveType_Short.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimitiveTypeReference_primitiveType_Void.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimitiveTypeReference_primitiveType_Void.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreatePrimitiveTypeReference_primitiveType_Void.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreatePrimitiveTypeReference_primitiveType_Void.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_Boolean.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_Boolean.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_Boolean.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_Boolean.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_Byte.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_Byte.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_Byte.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_Byte.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_Char.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_Char.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_Char.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_Char.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_ClassifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_ClassifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_ClassifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_ClassifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_Double.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_Double.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_Double.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_Double.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_Float.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_Float.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_Float.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_Float.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_InferableType.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_InferableType.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_InferableType.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_InferableType.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_Int.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_Int.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_Int.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_Int.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_Long.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_Long.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_Long.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_Long.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_NamespaceClassifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_NamespaceClassifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_NamespaceClassifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_NamespaceClassifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_Short.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_Short.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_Short.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_Short.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_Void.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_Void.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_Void.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateProvidesModuleDirective_serviceProviders_Void.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_Boolean.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_Boolean.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_Boolean.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_Boolean.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_Byte.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_Byte.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_Byte.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_Byte.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_Char.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_Char.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_Char.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_Char.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_ClassifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_ClassifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_ClassifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_ClassifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_Double.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_Double.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_Double.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_Double.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_Float.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_Float.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_Float.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_Float.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_InferableType.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_InferableType.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_InferableType.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_InferableType.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_Int.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_Int.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_Int.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_Int.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_Long.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_Long.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_Long.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_Long.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_NamespaceClassifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_NamespaceClassifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_NamespaceClassifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_NamespaceClassifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_Short.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_Short.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_Short.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_Short.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_Void.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_Void.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_Void.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReceiverParameter_outerTypeReference_Void.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReceiverParameter_thisReference_This.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReceiverParameter_thisReference_This.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReceiverParameter_thisReference_This.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReceiverParameter_thisReference_This.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReference_arraySelectors_ArraySelector.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReference_arraySelectors_ArraySelector.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReference_arraySelectors_ArraySelector.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReference_arraySelectors_ArraySelector.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReference_next_AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReference_next_AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReference_next_AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReference_next_AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReference_next_ArrayInstantiationBySize.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReference_next_ArrayInstantiationBySize.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReference_next_ArrayInstantiationBySize.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReference_next_ArrayInstantiationBySize.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReference_next_ArrayInstantiationByValuesTyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReference_next_ArrayInstantiationByValuesTyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReference_next_ArrayInstantiationByValuesTyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReference_next_ArrayInstantiationByValuesTyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReference_next_ArrayInstantiationByValuesUntyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReference_next_ArrayInstantiationByValuesUntyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReference_next_ArrayInstantiationByValuesUntyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReference_next_ArrayInstantiationByValuesUntyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReference_next_ExplicitConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReference_next_ExplicitConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReference_next_ExplicitConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReference_next_ExplicitConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReference_next_IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReference_next_IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReference_next_IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReference_next_IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReference_next_MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReference_next_MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReference_next_MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReference_next_MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReference_next_NestedExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReference_next_NestedExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReference_next_NestedExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReference_next_NestedExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReference_next_NewConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReference_next_NewConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReference_next_NewConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReference_next_NewConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReference_next_NewConstructorCallWithInferredTypeArguments.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReference_next_NewConstructorCallWithInferredTypeArguments.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReference_next_NewConstructorCallWithInferredTypeArguments.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReference_next_NewConstructorCallWithInferredTypeArguments.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReference_next_PrimitiveTypeReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReference_next_PrimitiveTypeReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReference_next_PrimitiveTypeReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReference_next_PrimitiveTypeReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReference_next_ReflectiveClassReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReference_next_ReflectiveClassReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReference_next_ReflectiveClassReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReference_next_ReflectiveClassReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReference_next_SelfReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReference_next_SelfReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReference_next_SelfReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReference_next_SelfReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReference_next_StringReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReference_next_StringReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReference_next_StringReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReference_next_StringReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReference_next_TextBlockReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReference_next_TextBlockReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReference_next_TextBlockReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReference_next_TextBlockReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_AdditiveExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_AdditiveExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_AdditiveExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_AdditiveExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_ArrayConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_ArrayConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_ArrayConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_ArrayConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_ArrayInstantiationBySize.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_ArrayInstantiationBySize.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_ArrayInstantiationBySize.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_ArrayInstantiationBySize.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_ArrayInstantiationByValuesTyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_ArrayInstantiationByValuesTyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_ArrayInstantiationByValuesTyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_ArrayInstantiationByValuesTyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_ArrayInstantiationByValuesUntyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_ArrayInstantiationByValuesUntyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_ArrayInstantiationByValuesUntyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_ArrayInstantiationByValuesUntyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_BinaryIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_BinaryIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_BinaryIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_BinaryIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_BinaryLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_BinaryLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_BinaryLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_BinaryLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_BooleanLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_BooleanLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_BooleanLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_BooleanLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_CastExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_CastExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_CastExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_CastExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_CharacterLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_CharacterLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_CharacterLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_CharacterLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_ClassTypeConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_ClassTypeConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_ClassTypeConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_ClassTypeConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_DecimalDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_DecimalDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_DecimalDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_DecimalDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_DecimalFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_DecimalFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_DecimalFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_DecimalFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_DecimalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_DecimalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_DecimalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_DecimalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_DecimalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_DecimalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_DecimalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_DecimalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_ExplicitConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_ExplicitConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_ExplicitConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_ExplicitConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_HexDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_HexDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_HexDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_HexDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_HexFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_HexFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_HexFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_HexFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_HexIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_HexIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_HexIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_HexIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_HexLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_HexLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_HexLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_HexLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_MultiplicativeExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_MultiplicativeExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_MultiplicativeExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_MultiplicativeExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_NestedExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_NestedExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_NestedExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_NestedExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_NewConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_NewConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_NewConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_NewConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_NewConstructorCallWithInferredTypeArguments.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_NewConstructorCallWithInferredTypeArguments.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_NewConstructorCallWithInferredTypeArguments.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_NewConstructorCallWithInferredTypeArguments.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_NullLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_NullLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_NullLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_NullLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_OctalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_OctalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_OctalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_OctalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_OctalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_OctalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_OctalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_OctalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_PrefixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_PrefixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_PrefixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_PrefixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_PrimaryExpressionReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_PrimaryExpressionReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_PrimaryExpressionReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_PrimaryExpressionReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_PrimitiveTypeReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_PrimitiveTypeReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_PrimitiveTypeReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_PrimitiveTypeReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_ReflectiveClassReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_ReflectiveClassReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_ReflectiveClassReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_ReflectiveClassReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_SelfReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_SelfReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_SelfReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_SelfReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_ShiftExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_ShiftExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_ShiftExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_ShiftExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_StringReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_StringReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_StringReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_StringReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_SuffixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_SuffixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_SuffixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_SuffixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_TextBlockReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_TextBlockReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_TextBlockReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_TextBlockReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_UnaryExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_UnaryExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_children_UnaryExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_children_UnaryExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_relationOperators_GreaterThan.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_relationOperators_GreaterThan.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_relationOperators_GreaterThan.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_relationOperators_GreaterThan.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_relationOperators_GreaterThanOrEqual.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_relationOperators_GreaterThanOrEqual.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_relationOperators_GreaterThanOrEqual.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_relationOperators_GreaterThanOrEqual.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_relationOperators_LessThan.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_relationOperators_LessThan.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_relationOperators_LessThan.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_relationOperators_LessThan.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_relationOperators_LessThanOrEqual.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_relationOperators_LessThanOrEqual.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRelationExpression_relationOperators_LessThanOrEqual.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRelationExpression_relationOperators_LessThanOrEqual.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRequiresModuleDirective_modifier_Static.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRequiresModuleDirective_modifier_Static.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRequiresModuleDirective_modifier_Static.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRequiresModuleDirective_modifier_Static.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRequiresModuleDirective_modifier_Transitive.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRequiresModuleDirective_modifier_Transitive.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRequiresModuleDirective_modifier_Transitive.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRequiresModuleDirective_modifier_Transitive.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRequiresModuleDirective_requiredModule_ModuleReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRequiresModuleDirective_requiredModule_ModuleReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateRequiresModuleDirective_requiredModule_ModuleReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateRequiresModuleDirective_requiredModule_ModuleReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_AdditiveExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_AdditiveExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_AdditiveExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_AdditiveExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_AndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_AndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_AndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_AndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_ArrayConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_ArrayConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_ArrayConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_ArrayConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_ArrayInstantiationBySize.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_ArrayInstantiationBySize.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_ArrayInstantiationBySize.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_ArrayInstantiationBySize.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_ArrayInstantiationByValuesTyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_ArrayInstantiationByValuesTyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_ArrayInstantiationByValuesTyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_ArrayInstantiationByValuesTyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_ArrayInstantiationByValuesUntyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_ArrayInstantiationByValuesUntyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_ArrayInstantiationByValuesUntyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_ArrayInstantiationByValuesUntyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_AssignmentExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_AssignmentExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_AssignmentExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_AssignmentExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_BinaryIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_BinaryIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_BinaryIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_BinaryIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_BinaryLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_BinaryLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_BinaryLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_BinaryLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_BooleanLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_BooleanLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_BooleanLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_BooleanLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_CastExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_CastExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_CastExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_CastExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_CharacterLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_CharacterLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_CharacterLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_CharacterLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_ClassTypeConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_ClassTypeConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_ClassTypeConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_ClassTypeConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_ConditionalAndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_ConditionalAndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_ConditionalAndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_ConditionalAndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_ConditionalExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_ConditionalExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_ConditionalExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_ConditionalExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_ConditionalOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_ConditionalOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_ConditionalOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_ConditionalOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_DecimalDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_DecimalDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_DecimalDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_DecimalDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_DecimalFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_DecimalFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_DecimalFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_DecimalFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_DecimalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_DecimalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_DecimalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_DecimalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_DecimalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_DecimalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_DecimalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_DecimalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_EqualityExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_EqualityExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_EqualityExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_EqualityExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_ExclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_ExclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_ExclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_ExclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_ExplicitConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_ExplicitConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_ExplicitConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_ExplicitConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_HexDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_HexDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_HexDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_HexDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_HexFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_HexFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_HexFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_HexFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_HexIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_HexIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_HexIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_HexIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_HexLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_HexLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_HexLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_HexLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_InclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_InclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_InclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_InclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_InstanceOfExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_InstanceOfExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_InstanceOfExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_InstanceOfExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_LambdaExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_LambdaExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_LambdaExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_LambdaExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_MultiplicativeExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_MultiplicativeExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_MultiplicativeExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_MultiplicativeExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_NestedExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_NestedExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_NestedExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_NestedExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_NewConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_NewConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_NewConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_NewConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_NewConstructorCallWithInferredTypeArguments.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_NewConstructorCallWithInferredTypeArguments.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_NewConstructorCallWithInferredTypeArguments.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_NewConstructorCallWithInferredTypeArguments.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_NullLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_NullLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_NullLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_NullLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_OctalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_OctalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_OctalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_OctalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_OctalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_OctalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_OctalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_OctalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_PrefixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_PrefixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_PrefixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_PrefixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_PrimaryExpressionReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_PrimaryExpressionReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_PrimaryExpressionReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_PrimaryExpressionReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_PrimitiveTypeReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_PrimitiveTypeReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_PrimitiveTypeReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_PrimitiveTypeReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_ReflectiveClassReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_ReflectiveClassReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_ReflectiveClassReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_ReflectiveClassReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_RelationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_RelationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_RelationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_RelationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_SelfReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_SelfReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_SelfReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_SelfReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_ShiftExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_ShiftExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_ShiftExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_ShiftExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_StringReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_StringReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_StringReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_StringReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_SuffixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_SuffixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_SuffixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_SuffixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_TextBlockReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_TextBlockReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_TextBlockReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_TextBlockReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_UnaryExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_UnaryExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateReturn_returnValue_UnaryExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateReturn_returnValue_UnaryExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSelfReference_self_Super.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSelfReference_self_Super.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSelfReference_self_Super.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSelfReference_self_Super.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSelfReference_self_This.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSelfReference_self_This.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSelfReference_self_This.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSelfReference_self_This.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_AdditiveExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_AdditiveExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_AdditiveExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_AdditiveExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_ArrayConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_ArrayConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_ArrayConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_ArrayConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_ArrayInstantiationBySize.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_ArrayInstantiationBySize.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_ArrayInstantiationBySize.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_ArrayInstantiationBySize.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_ArrayInstantiationByValuesTyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_ArrayInstantiationByValuesTyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_ArrayInstantiationByValuesTyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_ArrayInstantiationByValuesTyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_ArrayInstantiationByValuesUntyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_ArrayInstantiationByValuesUntyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_ArrayInstantiationByValuesUntyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_ArrayInstantiationByValuesUntyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_BinaryIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_BinaryIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_BinaryIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_BinaryIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_BinaryLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_BinaryLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_BinaryLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_BinaryLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_BooleanLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_BooleanLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_BooleanLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_BooleanLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_CastExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_CastExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_CastExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_CastExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_CharacterLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_CharacterLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_CharacterLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_CharacterLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_ClassTypeConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_ClassTypeConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_ClassTypeConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_ClassTypeConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_DecimalDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_DecimalDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_DecimalDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_DecimalDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_DecimalFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_DecimalFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_DecimalFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_DecimalFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_DecimalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_DecimalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_DecimalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_DecimalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_DecimalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_DecimalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_DecimalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_DecimalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_ExplicitConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_ExplicitConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_ExplicitConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_ExplicitConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_HexDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_HexDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_HexDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_HexDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_HexFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_HexFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_HexFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_HexFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_HexIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_HexIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_HexIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_HexIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_HexLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_HexLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_HexLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_HexLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_MultiplicativeExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_MultiplicativeExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_MultiplicativeExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_MultiplicativeExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_NestedExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_NestedExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_NestedExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_NestedExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_NewConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_NewConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_NewConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_NewConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_NewConstructorCallWithInferredTypeArguments.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_NewConstructorCallWithInferredTypeArguments.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_NewConstructorCallWithInferredTypeArguments.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_NewConstructorCallWithInferredTypeArguments.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_NullLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_NullLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_NullLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_NullLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_OctalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_OctalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_OctalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_OctalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_OctalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_OctalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_OctalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_OctalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_PrefixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_PrefixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_PrefixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_PrefixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_PrimaryExpressionReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_PrimaryExpressionReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_PrimaryExpressionReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_PrimaryExpressionReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_PrimitiveTypeReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_PrimitiveTypeReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_PrimitiveTypeReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_PrimitiveTypeReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_ReflectiveClassReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_ReflectiveClassReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_ReflectiveClassReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_ReflectiveClassReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_SelfReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_SelfReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_SelfReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_SelfReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_StringReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_StringReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_StringReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_StringReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_SuffixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_SuffixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_SuffixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_SuffixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_TextBlockReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_TextBlockReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_TextBlockReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_TextBlockReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_UnaryExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_UnaryExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_children_UnaryExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_children_UnaryExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_shiftOperators_LeftShift.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_shiftOperators_LeftShift.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_shiftOperators_LeftShift.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_shiftOperators_LeftShift.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_shiftOperators_RightShift.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_shiftOperators_RightShift.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_shiftOperators_RightShift.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_shiftOperators_RightShift.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_shiftOperators_UnsignedRightShift.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_shiftOperators_UnsignedRightShift.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateShiftExpression_shiftOperators_UnsignedRightShift.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateShiftExpression_shiftOperators_UnsignedRightShift.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_AdditiveExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_AdditiveExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_AdditiveExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_AdditiveExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_AndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_AndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_AndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_AndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_ArrayConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_ArrayConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_ArrayConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_ArrayConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_ArrayInitializer.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_ArrayInitializer.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_ArrayInitializer.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_ArrayInitializer.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_ArrayInstantiationBySize.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_ArrayInstantiationBySize.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_ArrayInstantiationBySize.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_ArrayInstantiationBySize.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_ArrayInstantiationByValuesTyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_ArrayInstantiationByValuesTyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_ArrayInstantiationByValuesTyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_ArrayInstantiationByValuesTyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_ArrayInstantiationByValuesUntyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_ArrayInstantiationByValuesUntyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_ArrayInstantiationByValuesUntyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_ArrayInstantiationByValuesUntyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_BinaryIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_BinaryIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_BinaryIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_BinaryIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_BinaryLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_BinaryLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_BinaryLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_BinaryLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_BooleanLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_BooleanLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_BooleanLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_BooleanLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_CastExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_CastExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_CastExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_CastExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_CharacterLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_CharacterLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_CharacterLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_CharacterLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_ClassTypeConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_ClassTypeConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_ClassTypeConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_ClassTypeConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_ConditionalAndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_ConditionalAndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_ConditionalAndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_ConditionalAndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_ConditionalExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_ConditionalExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_ConditionalExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_ConditionalExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_ConditionalOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_ConditionalOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_ConditionalOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_ConditionalOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_DecimalDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_DecimalDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_DecimalDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_DecimalDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_DecimalFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_DecimalFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_DecimalFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_DecimalFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_DecimalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_DecimalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_DecimalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_DecimalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_DecimalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_DecimalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_DecimalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_DecimalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_EqualityExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_EqualityExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_EqualityExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_EqualityExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_ExclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_ExclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_ExclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_ExclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_ExplicitConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_ExplicitConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_ExplicitConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_ExplicitConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_HexDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_HexDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_HexDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_HexDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_HexFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_HexFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_HexFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_HexFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_HexIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_HexIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_HexIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_HexIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_HexLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_HexLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_HexLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_HexLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_InclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_InclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_InclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_InclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_InstanceOfExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_InstanceOfExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_InstanceOfExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_InstanceOfExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_MultiplicativeExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_MultiplicativeExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_MultiplicativeExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_MultiplicativeExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_NestedExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_NestedExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_NestedExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_NestedExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_NewConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_NewConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_NewConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_NewConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_NewConstructorCallWithInferredTypeArguments.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_NewConstructorCallWithInferredTypeArguments.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_NewConstructorCallWithInferredTypeArguments.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_NewConstructorCallWithInferredTypeArguments.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_NullLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_NullLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_NullLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_NullLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_OctalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_OctalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_OctalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_OctalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_OctalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_OctalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_OctalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_OctalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_PrefixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_PrefixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_PrefixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_PrefixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_PrimaryExpressionReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_PrimaryExpressionReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_PrimaryExpressionReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_PrimaryExpressionReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_PrimitiveTypeReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_PrimitiveTypeReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_PrimitiveTypeReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_PrimitiveTypeReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_ReflectiveClassReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_ReflectiveClassReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_ReflectiveClassReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_ReflectiveClassReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_RelationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_RelationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_RelationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_RelationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_SelfReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_SelfReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_SelfReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_SelfReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_ShiftExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_ShiftExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_ShiftExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_ShiftExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_StringReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_StringReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_StringReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_StringReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_SuffixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_SuffixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_SuffixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_SuffixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_TextBlockReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_TextBlockReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_TextBlockReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_TextBlockReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_UnaryExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_UnaryExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSingleAnnotationParameter_value_UnaryExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSingleAnnotationParameter_value_UnaryExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStatementContainer_statement_Annotation.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStatementContainer_statement_Annotation.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStatementContainer_statement_Annotation.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStatementContainer_statement_Annotation.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStatementContainer_statement_Assert.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStatementContainer_statement_Assert.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStatementContainer_statement_Assert.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStatementContainer_statement_Assert.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStatementContainer_statement_Block.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStatementContainer_statement_Block.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStatementContainer_statement_Block.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStatementContainer_statement_Block.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStatementContainer_statement_Break.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStatementContainer_statement_Break.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStatementContainer_statement_Break.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStatementContainer_statement_Break.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStatementContainer_statement_Class.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStatementContainer_statement_Class.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStatementContainer_statement_Class.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStatementContainer_statement_Class.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStatementContainer_statement_Condition.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStatementContainer_statement_Condition.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStatementContainer_statement_Condition.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStatementContainer_statement_Condition.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStatementContainer_statement_Continue.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStatementContainer_statement_Continue.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStatementContainer_statement_Continue.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStatementContainer_statement_Continue.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStatementContainer_statement_DoWhileLoop.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStatementContainer_statement_DoWhileLoop.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStatementContainer_statement_DoWhileLoop.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStatementContainer_statement_DoWhileLoop.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStatementContainer_statement_EmptyStatement.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStatementContainer_statement_EmptyStatement.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStatementContainer_statement_EmptyStatement.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStatementContainer_statement_EmptyStatement.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStatementContainer_statement_Enumeration.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStatementContainer_statement_Enumeration.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStatementContainer_statement_Enumeration.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStatementContainer_statement_Enumeration.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStatementContainer_statement_ExpressionStatement.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStatementContainer_statement_ExpressionStatement.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStatementContainer_statement_ExpressionStatement.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStatementContainer_statement_ExpressionStatement.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStatementContainer_statement_ForEachLoop.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStatementContainer_statement_ForEachLoop.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStatementContainer_statement_ForEachLoop.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStatementContainer_statement_ForEachLoop.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStatementContainer_statement_ForLoop.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStatementContainer_statement_ForLoop.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStatementContainer_statement_ForLoop.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStatementContainer_statement_ForLoop.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStatementContainer_statement_Interface.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStatementContainer_statement_Interface.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStatementContainer_statement_Interface.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStatementContainer_statement_Interface.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStatementContainer_statement_JumpLabel.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStatementContainer_statement_JumpLabel.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStatementContainer_statement_JumpLabel.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStatementContainer_statement_JumpLabel.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStatementContainer_statement_LocalVariableStatement.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStatementContainer_statement_LocalVariableStatement.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStatementContainer_statement_LocalVariableStatement.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStatementContainer_statement_LocalVariableStatement.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStatementContainer_statement_Return.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStatementContainer_statement_Return.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStatementContainer_statement_Return.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStatementContainer_statement_Return.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStatementContainer_statement_Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStatementContainer_statement_Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStatementContainer_statement_Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStatementContainer_statement_Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStatementContainer_statement_SynchronizedBlock.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStatementContainer_statement_SynchronizedBlock.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStatementContainer_statement_SynchronizedBlock.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStatementContainer_statement_SynchronizedBlock.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStatementContainer_statement_Throw.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStatementContainer_statement_Throw.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStatementContainer_statement_Throw.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStatementContainer_statement_Throw.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStatementContainer_statement_TryBlock.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStatementContainer_statement_TryBlock.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStatementContainer_statement_TryBlock.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStatementContainer_statement_TryBlock.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStatementContainer_statement_WhileLoop.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStatementContainer_statement_WhileLoop.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStatementContainer_statement_WhileLoop.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStatementContainer_statement_WhileLoop.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStatementContainer_statement_YieldStatement.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStatementContainer_statement_YieldStatement.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStatementContainer_statement_YieldStatement.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStatementContainer_statement_YieldStatement.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStaticImport_static_Static.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStaticImport_static_Static.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateStaticImport_static_Static.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateStaticImport_static_Static.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSuperTypeArgument_superType_Boolean.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSuperTypeArgument_superType_Boolean.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSuperTypeArgument_superType_Boolean.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSuperTypeArgument_superType_Boolean.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSuperTypeArgument_superType_Byte.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSuperTypeArgument_superType_Byte.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSuperTypeArgument_superType_Byte.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSuperTypeArgument_superType_Byte.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSuperTypeArgument_superType_Char.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSuperTypeArgument_superType_Char.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSuperTypeArgument_superType_Char.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSuperTypeArgument_superType_Char.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSuperTypeArgument_superType_ClassifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSuperTypeArgument_superType_ClassifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSuperTypeArgument_superType_ClassifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSuperTypeArgument_superType_ClassifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSuperTypeArgument_superType_Double.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSuperTypeArgument_superType_Double.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSuperTypeArgument_superType_Double.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSuperTypeArgument_superType_Double.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSuperTypeArgument_superType_Float.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSuperTypeArgument_superType_Float.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSuperTypeArgument_superType_Float.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSuperTypeArgument_superType_Float.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSuperTypeArgument_superType_InferableType.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSuperTypeArgument_superType_InferableType.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSuperTypeArgument_superType_InferableType.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSuperTypeArgument_superType_InferableType.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSuperTypeArgument_superType_Int.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSuperTypeArgument_superType_Int.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSuperTypeArgument_superType_Int.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSuperTypeArgument_superType_Int.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSuperTypeArgument_superType_Long.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSuperTypeArgument_superType_Long.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSuperTypeArgument_superType_Long.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSuperTypeArgument_superType_Long.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSuperTypeArgument_superType_NamespaceClassifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSuperTypeArgument_superType_NamespaceClassifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSuperTypeArgument_superType_NamespaceClassifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSuperTypeArgument_superType_NamespaceClassifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSuperTypeArgument_superType_Short.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSuperTypeArgument_superType_Short.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSuperTypeArgument_superType_Short.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSuperTypeArgument_superType_Short.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSuperTypeArgument_superType_Void.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSuperTypeArgument_superType_Void.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSuperTypeArgument_superType_Void.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSuperTypeArgument_superType_Void.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitchCase_statements_Annotation.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitchCase_statements_Annotation.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitchCase_statements_Annotation.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitchCase_statements_Annotation.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitchCase_statements_Assert.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitchCase_statements_Assert.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitchCase_statements_Assert.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitchCase_statements_Assert.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitchCase_statements_Block.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitchCase_statements_Block.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitchCase_statements_Block.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitchCase_statements_Block.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitchCase_statements_Break.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitchCase_statements_Break.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitchCase_statements_Break.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitchCase_statements_Break.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitchCase_statements_Class.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitchCase_statements_Class.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitchCase_statements_Class.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitchCase_statements_Class.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitchCase_statements_Condition.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitchCase_statements_Condition.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitchCase_statements_Condition.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitchCase_statements_Condition.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitchCase_statements_Continue.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitchCase_statements_Continue.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitchCase_statements_Continue.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitchCase_statements_Continue.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitchCase_statements_DoWhileLoop.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitchCase_statements_DoWhileLoop.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitchCase_statements_DoWhileLoop.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitchCase_statements_DoWhileLoop.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitchCase_statements_EmptyStatement.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitchCase_statements_EmptyStatement.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitchCase_statements_EmptyStatement.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitchCase_statements_EmptyStatement.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitchCase_statements_Enumeration.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitchCase_statements_Enumeration.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitchCase_statements_Enumeration.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitchCase_statements_Enumeration.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitchCase_statements_ExpressionStatement.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitchCase_statements_ExpressionStatement.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitchCase_statements_ExpressionStatement.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitchCase_statements_ExpressionStatement.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitchCase_statements_ForEachLoop.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitchCase_statements_ForEachLoop.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitchCase_statements_ForEachLoop.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitchCase_statements_ForEachLoop.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitchCase_statements_ForLoop.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitchCase_statements_ForLoop.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitchCase_statements_ForLoop.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitchCase_statements_ForLoop.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitchCase_statements_Interface.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitchCase_statements_Interface.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitchCase_statements_Interface.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitchCase_statements_Interface.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitchCase_statements_JumpLabel.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitchCase_statements_JumpLabel.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitchCase_statements_JumpLabel.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitchCase_statements_JumpLabel.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitchCase_statements_LocalVariableStatement.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitchCase_statements_LocalVariableStatement.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitchCase_statements_LocalVariableStatement.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitchCase_statements_LocalVariableStatement.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitchCase_statements_Return.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitchCase_statements_Return.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitchCase_statements_Return.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitchCase_statements_Return.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitchCase_statements_Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitchCase_statements_Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitchCase_statements_Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitchCase_statements_Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitchCase_statements_SynchronizedBlock.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitchCase_statements_SynchronizedBlock.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitchCase_statements_SynchronizedBlock.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitchCase_statements_SynchronizedBlock.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitchCase_statements_Throw.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitchCase_statements_Throw.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitchCase_statements_Throw.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitchCase_statements_Throw.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitchCase_statements_TryBlock.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitchCase_statements_TryBlock.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitchCase_statements_TryBlock.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitchCase_statements_TryBlock.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitchCase_statements_WhileLoop.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitchCase_statements_WhileLoop.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitchCase_statements_WhileLoop.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitchCase_statements_WhileLoop.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitchCase_statements_YieldStatement.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitchCase_statements_YieldStatement.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitchCase_statements_YieldStatement.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitchCase_statements_YieldStatement.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_cases_DefaultSwitchCase.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_cases_DefaultSwitchCase.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_cases_DefaultSwitchCase.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_cases_DefaultSwitchCase.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_cases_DefaultSwitchRule.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_cases_DefaultSwitchRule.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_cases_DefaultSwitchRule.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_cases_DefaultSwitchRule.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_cases_NormalSwitchCase.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_cases_NormalSwitchCase.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_cases_NormalSwitchCase.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_cases_NormalSwitchCase.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_cases_NormalSwitchRule.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_cases_NormalSwitchRule.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_cases_NormalSwitchRule.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_cases_NormalSwitchRule.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_AdditiveExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_AdditiveExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_AdditiveExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_AdditiveExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_AndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_AndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_AndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_AndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_ArrayConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_ArrayConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_ArrayConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_ArrayConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_ArrayInstantiationBySize.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_ArrayInstantiationBySize.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_ArrayInstantiationBySize.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_ArrayInstantiationBySize.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_ArrayInstantiationByValuesTyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_ArrayInstantiationByValuesTyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_ArrayInstantiationByValuesTyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_ArrayInstantiationByValuesTyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_ArrayInstantiationByValuesUntyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_ArrayInstantiationByValuesUntyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_ArrayInstantiationByValuesUntyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_ArrayInstantiationByValuesUntyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_AssignmentExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_AssignmentExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_AssignmentExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_AssignmentExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_BinaryIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_BinaryIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_BinaryIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_BinaryIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_BinaryLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_BinaryLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_BinaryLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_BinaryLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_BooleanLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_BooleanLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_BooleanLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_BooleanLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_CastExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_CastExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_CastExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_CastExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_CharacterLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_CharacterLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_CharacterLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_CharacterLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_ClassTypeConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_ClassTypeConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_ClassTypeConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_ClassTypeConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_ConditionalAndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_ConditionalAndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_ConditionalAndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_ConditionalAndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_ConditionalExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_ConditionalExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_ConditionalExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_ConditionalExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_ConditionalOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_ConditionalOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_ConditionalOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_ConditionalOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_DecimalDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_DecimalDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_DecimalDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_DecimalDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_DecimalFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_DecimalFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_DecimalFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_DecimalFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_DecimalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_DecimalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_DecimalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_DecimalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_DecimalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_DecimalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_DecimalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_DecimalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_EqualityExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_EqualityExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_EqualityExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_EqualityExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_ExclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_ExclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_ExclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_ExclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_ExplicitConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_ExplicitConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_ExplicitConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_ExplicitConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_HexDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_HexDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_HexDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_HexDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_HexFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_HexFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_HexFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_HexFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_HexIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_HexIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_HexIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_HexIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_HexLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_HexLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_HexLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_HexLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_InclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_InclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_InclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_InclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_InstanceOfExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_InstanceOfExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_InstanceOfExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_InstanceOfExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_LambdaExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_LambdaExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_LambdaExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_LambdaExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_MultiplicativeExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_MultiplicativeExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_MultiplicativeExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_MultiplicativeExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_NestedExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_NestedExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_NestedExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_NestedExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_NewConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_NewConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_NewConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_NewConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_NewConstructorCallWithInferredTypeArguments.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_NewConstructorCallWithInferredTypeArguments.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_NewConstructorCallWithInferredTypeArguments.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_NewConstructorCallWithInferredTypeArguments.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_NullLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_NullLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_NullLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_NullLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_OctalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_OctalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_OctalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_OctalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_OctalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_OctalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_OctalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_OctalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_PrefixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_PrefixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_PrefixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_PrefixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_PrimaryExpressionReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_PrimaryExpressionReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_PrimaryExpressionReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_PrimaryExpressionReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_PrimitiveTypeReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_PrimitiveTypeReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_PrimitiveTypeReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_PrimitiveTypeReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_ReflectiveClassReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_ReflectiveClassReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_ReflectiveClassReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_ReflectiveClassReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_RelationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_RelationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_RelationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_RelationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_SelfReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_SelfReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_SelfReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_SelfReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_ShiftExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_ShiftExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_ShiftExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_ShiftExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_StringReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_StringReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_StringReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_StringReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_SuffixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_SuffixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_SuffixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_SuffixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_TextBlockReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_TextBlockReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_TextBlockReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_TextBlockReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_UnaryExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_UnaryExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSwitch_variable_UnaryExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSwitch_variable_UnaryExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_AdditiveExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_AdditiveExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_AdditiveExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_AdditiveExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_AndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_AndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_AndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_AndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ArrayConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ArrayConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ArrayConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ArrayConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ArrayInstantiationBySize.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ArrayInstantiationBySize.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ArrayInstantiationBySize.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ArrayInstantiationBySize.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ArrayInstantiationByValuesTyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ArrayInstantiationByValuesTyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ArrayInstantiationByValuesTyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ArrayInstantiationByValuesTyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ArrayInstantiationByValuesUntyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ArrayInstantiationByValuesUntyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ArrayInstantiationByValuesUntyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ArrayInstantiationByValuesUntyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_AssignmentExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_AssignmentExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_AssignmentExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_AssignmentExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_BinaryIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_BinaryIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_BinaryIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_BinaryIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_BinaryLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_BinaryLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_BinaryLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_BinaryLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_BooleanLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_BooleanLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_BooleanLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_BooleanLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_CastExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_CastExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_CastExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_CastExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_CharacterLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_CharacterLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_CharacterLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_CharacterLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ClassTypeConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ClassTypeConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ClassTypeConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ClassTypeConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ConditionalAndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ConditionalAndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ConditionalAndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ConditionalAndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ConditionalExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ConditionalExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ConditionalExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ConditionalExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ConditionalOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ConditionalOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ConditionalOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ConditionalOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_DecimalDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_DecimalDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_DecimalDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_DecimalDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_DecimalFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_DecimalFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_DecimalFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_DecimalFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_DecimalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_DecimalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_DecimalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_DecimalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_DecimalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_DecimalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_DecimalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_DecimalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_EqualityExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_EqualityExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_EqualityExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_EqualityExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ExclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ExclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ExclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ExclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ExplicitConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ExplicitConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ExplicitConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ExplicitConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_HexDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_HexDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_HexDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_HexDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_HexFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_HexFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_HexFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_HexFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_HexIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_HexIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_HexIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_HexIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_HexLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_HexLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_HexLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_HexLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_InclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_InclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_InclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_InclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_InstanceOfExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_InstanceOfExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_InstanceOfExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_InstanceOfExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_LambdaExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_LambdaExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_LambdaExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_LambdaExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_MultiplicativeExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_MultiplicativeExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_MultiplicativeExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_MultiplicativeExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_NestedExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_NestedExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_NestedExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_NestedExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_NewConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_NewConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_NewConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_NewConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_NewConstructorCallWithInferredTypeArguments.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_NewConstructorCallWithInferredTypeArguments.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_NewConstructorCallWithInferredTypeArguments.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_NewConstructorCallWithInferredTypeArguments.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_NullLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_NullLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_NullLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_NullLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_OctalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_OctalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_OctalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_OctalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_OctalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_OctalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_OctalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_OctalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_PrefixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_PrefixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_PrefixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_PrefixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_PrimaryExpressionReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_PrimaryExpressionReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_PrimaryExpressionReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_PrimaryExpressionReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_PrimitiveTypeReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_PrimitiveTypeReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_PrimitiveTypeReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_PrimitiveTypeReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ReflectiveClassReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ReflectiveClassReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ReflectiveClassReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ReflectiveClassReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_RelationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_RelationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_RelationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_RelationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_SelfReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_SelfReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_SelfReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_SelfReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ShiftExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ShiftExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ShiftExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_ShiftExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_StringReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_StringReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_StringReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_StringReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_SuffixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_SuffixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_SuffixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_SuffixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_TextBlockReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_TextBlockReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_TextBlockReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_TextBlockReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_UnaryExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_UnaryExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_UnaryExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateSynchronizedBlock_lockProvider_UnaryExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_AdditiveExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_AdditiveExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_AdditiveExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_AdditiveExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_AndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_AndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_AndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_AndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_ArrayConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_ArrayConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_ArrayConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_ArrayConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_ArrayInstantiationBySize.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_ArrayInstantiationBySize.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_ArrayInstantiationBySize.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_ArrayInstantiationBySize.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_ArrayInstantiationByValuesTyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_ArrayInstantiationByValuesTyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_ArrayInstantiationByValuesTyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_ArrayInstantiationByValuesTyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_ArrayInstantiationByValuesUntyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_ArrayInstantiationByValuesUntyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_ArrayInstantiationByValuesUntyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_ArrayInstantiationByValuesUntyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_AssignmentExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_AssignmentExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_AssignmentExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_AssignmentExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_BinaryIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_BinaryIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_BinaryIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_BinaryIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_BinaryLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_BinaryLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_BinaryLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_BinaryLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_BooleanLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_BooleanLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_BooleanLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_BooleanLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_CastExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_CastExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_CastExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_CastExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_CharacterLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_CharacterLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_CharacterLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_CharacterLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_ClassTypeConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_ClassTypeConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_ClassTypeConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_ClassTypeConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_ConditionalAndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_ConditionalAndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_ConditionalAndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_ConditionalAndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_ConditionalExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_ConditionalExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_ConditionalExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_ConditionalExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_ConditionalOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_ConditionalOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_ConditionalOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_ConditionalOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_DecimalDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_DecimalDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_DecimalDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_DecimalDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_DecimalFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_DecimalFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_DecimalFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_DecimalFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_DecimalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_DecimalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_DecimalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_DecimalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_DecimalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_DecimalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_DecimalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_DecimalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_EqualityExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_EqualityExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_EqualityExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_EqualityExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_ExclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_ExclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_ExclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_ExclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_ExplicitConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_ExplicitConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_ExplicitConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_ExplicitConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_HexDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_HexDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_HexDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_HexDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_HexFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_HexFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_HexFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_HexFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_HexIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_HexIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_HexIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_HexIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_HexLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_HexLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_HexLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_HexLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_InclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_InclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_InclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_InclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_InstanceOfExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_InstanceOfExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_InstanceOfExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_InstanceOfExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_LambdaExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_LambdaExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_LambdaExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_LambdaExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_MultiplicativeExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_MultiplicativeExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_MultiplicativeExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_MultiplicativeExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_NestedExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_NestedExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_NestedExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_NestedExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_NewConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_NewConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_NewConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_NewConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_NewConstructorCallWithInferredTypeArguments.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_NewConstructorCallWithInferredTypeArguments.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_NewConstructorCallWithInferredTypeArguments.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_NewConstructorCallWithInferredTypeArguments.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_NullLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_NullLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_NullLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_NullLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_OctalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_OctalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_OctalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_OctalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_OctalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_OctalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_OctalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_OctalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_PrefixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_PrefixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_PrefixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_PrefixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_PrimaryExpressionReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_PrimaryExpressionReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_PrimaryExpressionReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_PrimaryExpressionReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_PrimitiveTypeReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_PrimitiveTypeReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_PrimitiveTypeReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_PrimitiveTypeReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_ReflectiveClassReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_ReflectiveClassReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_ReflectiveClassReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_ReflectiveClassReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_RelationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_RelationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_RelationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_RelationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_SelfReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_SelfReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_SelfReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_SelfReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_ShiftExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_ShiftExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_ShiftExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_ShiftExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_StringReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_StringReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_StringReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_StringReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_SuffixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_SuffixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_SuffixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_SuffixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_TextBlockReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_TextBlockReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_TextBlockReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_TextBlockReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_UnaryExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_UnaryExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateThrow_throwable_UnaryExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateThrow_throwable_UnaryExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTryBlock_catchBlocks_CatchBlock.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTryBlock_catchBlocks_CatchBlock.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTryBlock_catchBlocks_CatchBlock.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTryBlock_catchBlocks_CatchBlock.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTryBlock_finallyBlock_Block.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTryBlock_finallyBlock_Block.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTryBlock_finallyBlock_Block.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTryBlock_finallyBlock_Block.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTryBlock_resources_IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTryBlock_resources_IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTryBlock_resources_IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTryBlock_resources_IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTryBlock_resources_LocalVariable.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTryBlock_resources_LocalVariable.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTryBlock_resources_LocalVariable.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTryBlock_resources_LocalVariable.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTryBlock_resources_MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTryBlock_resources_MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTryBlock_resources_MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTryBlock_resources_MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypeArgumentable_typeArguments_ExtendsTypeArgument.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypeArgumentable_typeArguments_ExtendsTypeArgument.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypeArgumentable_typeArguments_ExtendsTypeArgument.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypeArgumentable_typeArguments_ExtendsTypeArgument.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypeArgumentable_typeArguments_QualifiedTypeArgument.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypeArgumentable_typeArguments_QualifiedTypeArgument.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypeArgumentable_typeArguments_QualifiedTypeArgument.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypeArgumentable_typeArguments_QualifiedTypeArgument.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypeArgumentable_typeArguments_SuperTypeArgument.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypeArgumentable_typeArguments_SuperTypeArgument.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypeArgumentable_typeArguments_SuperTypeArgument.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypeArgumentable_typeArguments_SuperTypeArgument.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypeArgumentable_typeArguments_UnknownTypeArgument.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypeArgumentable_typeArguments_UnknownTypeArgument.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypeArgumentable_typeArguments_UnknownTypeArgument.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypeArgumentable_typeArguments_UnknownTypeArgument.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypeParameter_extendTypes_Boolean.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypeParameter_extendTypes_Boolean.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypeParameter_extendTypes_Boolean.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypeParameter_extendTypes_Boolean.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypeParameter_extendTypes_Byte.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypeParameter_extendTypes_Byte.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypeParameter_extendTypes_Byte.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypeParameter_extendTypes_Byte.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypeParameter_extendTypes_Char.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypeParameter_extendTypes_Char.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypeParameter_extendTypes_Char.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypeParameter_extendTypes_Char.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypeParameter_extendTypes_ClassifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypeParameter_extendTypes_ClassifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypeParameter_extendTypes_ClassifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypeParameter_extendTypes_ClassifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypeParameter_extendTypes_Double.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypeParameter_extendTypes_Double.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypeParameter_extendTypes_Double.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypeParameter_extendTypes_Double.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypeParameter_extendTypes_Float.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypeParameter_extendTypes_Float.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypeParameter_extendTypes_Float.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypeParameter_extendTypes_Float.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypeParameter_extendTypes_InferableType.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypeParameter_extendTypes_InferableType.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypeParameter_extendTypes_InferableType.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypeParameter_extendTypes_InferableType.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypeParameter_extendTypes_Int.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypeParameter_extendTypes_Int.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypeParameter_extendTypes_Int.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypeParameter_extendTypes_Int.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypeParameter_extendTypes_Long.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypeParameter_extendTypes_Long.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypeParameter_extendTypes_Long.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypeParameter_extendTypes_Long.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypeParameter_extendTypes_NamespaceClassifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypeParameter_extendTypes_NamespaceClassifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypeParameter_extendTypes_NamespaceClassifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypeParameter_extendTypes_NamespaceClassifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypeParameter_extendTypes_Short.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypeParameter_extendTypes_Short.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypeParameter_extendTypes_Short.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypeParameter_extendTypes_Short.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypeParameter_extendTypes_Void.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypeParameter_extendTypes_Void.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypeParameter_extendTypes_Void.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypeParameter_extendTypes_Void.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypeParametrizable_typeParameters_TypeParameter.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypeParametrizable_typeParameters_TypeParameter.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypeParametrizable_typeParameters_TypeParameter.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypeParametrizable_typeParameters_TypeParameter.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElementExtension_actualTargets_Boolean.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElementExtension_actualTargets_Boolean.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElementExtension_actualTargets_Boolean.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElementExtension_actualTargets_Boolean.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElementExtension_actualTargets_Byte.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElementExtension_actualTargets_Byte.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElementExtension_actualTargets_Byte.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElementExtension_actualTargets_Byte.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElementExtension_actualTargets_Char.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElementExtension_actualTargets_Char.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElementExtension_actualTargets_Char.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElementExtension_actualTargets_Char.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElementExtension_actualTargets_ClassifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElementExtension_actualTargets_ClassifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElementExtension_actualTargets_ClassifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElementExtension_actualTargets_ClassifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElementExtension_actualTargets_Double.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElementExtension_actualTargets_Double.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElementExtension_actualTargets_Double.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElementExtension_actualTargets_Double.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElementExtension_actualTargets_Float.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElementExtension_actualTargets_Float.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElementExtension_actualTargets_Float.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElementExtension_actualTargets_Float.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElementExtension_actualTargets_InferableType.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElementExtension_actualTargets_InferableType.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElementExtension_actualTargets_InferableType.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElementExtension_actualTargets_InferableType.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElementExtension_actualTargets_Int.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElementExtension_actualTargets_Int.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElementExtension_actualTargets_Int.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElementExtension_actualTargets_Int.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElementExtension_actualTargets_Long.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElementExtension_actualTargets_Long.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElementExtension_actualTargets_Long.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElementExtension_actualTargets_Long.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElementExtension_actualTargets_NamespaceClassifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElementExtension_actualTargets_NamespaceClassifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElementExtension_actualTargets_NamespaceClassifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElementExtension_actualTargets_NamespaceClassifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElementExtension_actualTargets_Short.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElementExtension_actualTargets_Short.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElementExtension_actualTargets_Short.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElementExtension_actualTargets_Short.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElementExtension_actualTargets_Void.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElementExtension_actualTargets_Void.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElementExtension_actualTargets_Void.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElementExtension_actualTargets_Void.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElement_typeReference_Boolean.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElement_typeReference_Boolean.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElement_typeReference_Boolean.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElement_typeReference_Boolean.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElement_typeReference_Byte.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElement_typeReference_Byte.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElement_typeReference_Byte.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElement_typeReference_Byte.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElement_typeReference_Char.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElement_typeReference_Char.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElement_typeReference_Char.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElement_typeReference_Char.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElement_typeReference_ClassifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElement_typeReference_ClassifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElement_typeReference_ClassifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElement_typeReference_ClassifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElement_typeReference_Double.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElement_typeReference_Double.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElement_typeReference_Double.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElement_typeReference_Double.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElement_typeReference_Float.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElement_typeReference_Float.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElement_typeReference_Float.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElement_typeReference_Float.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElement_typeReference_InferableType.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElement_typeReference_InferableType.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElement_typeReference_InferableType.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElement_typeReference_InferableType.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElement_typeReference_Int.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElement_typeReference_Int.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElement_typeReference_Int.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElement_typeReference_Int.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElement_typeReference_Long.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElement_typeReference_Long.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElement_typeReference_Long.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElement_typeReference_Long.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElement_typeReference_NamespaceClassifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElement_typeReference_NamespaceClassifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElement_typeReference_NamespaceClassifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElement_typeReference_NamespaceClassifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElement_typeReference_Short.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElement_typeReference_Short.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElement_typeReference_Short.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElement_typeReference_Short.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElement_typeReference_Void.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElement_typeReference_Void.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateTypedElement_typeReference_Void.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateTypedElement_typeReference_Void.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_ArrayConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_ArrayConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_ArrayConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_ArrayConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_ArrayInstantiationBySize.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_ArrayInstantiationBySize.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_ArrayInstantiationBySize.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_ArrayInstantiationBySize.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_ArrayInstantiationByValuesTyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_ArrayInstantiationByValuesTyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_ArrayInstantiationByValuesTyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_ArrayInstantiationByValuesTyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_ArrayInstantiationByValuesUntyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_ArrayInstantiationByValuesUntyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_ArrayInstantiationByValuesUntyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_ArrayInstantiationByValuesUntyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_BinaryIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_BinaryIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_BinaryIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_BinaryIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_BinaryLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_BinaryLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_BinaryLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_BinaryLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_BooleanLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_BooleanLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_BooleanLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_BooleanLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_CastExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_CastExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_CastExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_CastExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_CharacterLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_CharacterLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_CharacterLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_CharacterLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_ClassTypeConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_ClassTypeConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_ClassTypeConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_ClassTypeConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_DecimalDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_DecimalDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_DecimalDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_DecimalDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_DecimalFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_DecimalFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_DecimalFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_DecimalFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_DecimalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_DecimalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_DecimalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_DecimalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_DecimalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_DecimalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_DecimalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_DecimalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_ExplicitConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_ExplicitConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_ExplicitConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_ExplicitConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_HexDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_HexDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_HexDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_HexDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_HexFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_HexFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_HexFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_HexFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_HexIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_HexIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_HexIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_HexIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_HexLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_HexLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_HexLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_HexLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_NestedExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_NestedExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_NestedExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_NestedExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_NewConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_NewConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_NewConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_NewConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_NewConstructorCallWithInferredTypeArguments.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_NewConstructorCallWithInferredTypeArguments.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_NewConstructorCallWithInferredTypeArguments.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_NewConstructorCallWithInferredTypeArguments.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_NullLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_NullLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_NullLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_NullLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_OctalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_OctalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_OctalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_OctalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_OctalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_OctalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_OctalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_OctalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_PrefixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_PrefixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_PrefixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_PrefixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_PrimaryExpressionReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_PrimaryExpressionReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_PrimaryExpressionReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_PrimaryExpressionReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_PrimitiveTypeReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_PrimitiveTypeReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_PrimitiveTypeReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_PrimitiveTypeReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_ReflectiveClassReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_ReflectiveClassReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_ReflectiveClassReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_ReflectiveClassReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_SelfReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_SelfReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_SelfReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_SelfReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_StringReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_StringReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_StringReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_StringReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_SuffixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_SuffixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_SuffixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_SuffixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_TextBlockReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_TextBlockReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_child_TextBlockReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_child_TextBlockReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_operators_Addition.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_operators_Addition.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_operators_Addition.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_operators_Addition.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_operators_Complement.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_operators_Complement.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_operators_Complement.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_operators_Complement.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_operators_Negate.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_operators_Negate.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_operators_Negate.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_operators_Negate.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_operators_Subtraction.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_operators_Subtraction.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryExpression_operators_Subtraction.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryExpression_operators_Subtraction.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_ArrayConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_ArrayConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_ArrayConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_ArrayConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_ArrayInstantiationBySize.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_ArrayInstantiationBySize.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_ArrayInstantiationBySize.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_ArrayInstantiationBySize.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_ArrayInstantiationByValuesTyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_ArrayInstantiationByValuesTyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_ArrayInstantiationByValuesTyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_ArrayInstantiationByValuesTyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_ArrayInstantiationByValuesUntyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_ArrayInstantiationByValuesUntyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_ArrayInstantiationByValuesUntyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_ArrayInstantiationByValuesUntyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_BinaryIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_BinaryIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_BinaryIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_BinaryIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_BinaryLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_BinaryLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_BinaryLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_BinaryLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_BooleanLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_BooleanLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_BooleanLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_BooleanLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_CastExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_CastExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_CastExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_CastExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_CharacterLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_CharacterLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_CharacterLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_CharacterLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_ClassTypeConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_ClassTypeConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_ClassTypeConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_ClassTypeConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_DecimalDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_DecimalDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_DecimalDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_DecimalDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_DecimalFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_DecimalFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_DecimalFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_DecimalFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_DecimalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_DecimalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_DecimalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_DecimalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_DecimalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_DecimalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_DecimalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_DecimalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_ExplicitConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_ExplicitConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_ExplicitConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_ExplicitConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_HexDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_HexDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_HexDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_HexDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_HexFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_HexFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_HexFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_HexFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_HexIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_HexIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_HexIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_HexIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_HexLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_HexLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_HexLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_HexLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_NestedExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_NestedExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_NestedExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_NestedExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_NewConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_NewConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_NewConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_NewConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_NewConstructorCallWithInferredTypeArguments.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_NewConstructorCallWithInferredTypeArguments.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_NewConstructorCallWithInferredTypeArguments.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_NewConstructorCallWithInferredTypeArguments.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_NullLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_NullLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_NullLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_NullLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_OctalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_OctalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_OctalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_OctalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_OctalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_OctalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_OctalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_OctalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_PrimaryExpressionReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_PrimaryExpressionReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_PrimaryExpressionReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_PrimaryExpressionReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_PrimitiveTypeReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_PrimitiveTypeReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_PrimitiveTypeReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_PrimitiveTypeReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_ReflectiveClassReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_ReflectiveClassReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_ReflectiveClassReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_ReflectiveClassReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_SelfReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_SelfReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_SelfReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_SelfReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_StringReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_StringReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_StringReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_StringReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_TextBlockReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_TextBlockReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_child_TextBlockReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_child_TextBlockReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_operator_MinusMinus.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_operator_MinusMinus.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_operator_MinusMinus.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_operator_MinusMinus.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_operator_PlusPlus.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_operator_PlusPlus.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateUnaryModificationExpression_operator_PlusPlus.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateUnaryModificationExpression_operator_PlusPlus.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_AdditiveExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_AdditiveExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_AdditiveExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_AdditiveExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_AndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_AndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_AndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_AndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_ArrayConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_ArrayConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_ArrayConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_ArrayConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_ArrayInstantiationBySize.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_ArrayInstantiationBySize.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_ArrayInstantiationBySize.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_ArrayInstantiationBySize.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_ArrayInstantiationByValuesTyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_ArrayInstantiationByValuesTyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_ArrayInstantiationByValuesTyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_ArrayInstantiationByValuesTyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_ArrayInstantiationByValuesUntyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_ArrayInstantiationByValuesUntyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_ArrayInstantiationByValuesUntyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_ArrayInstantiationByValuesUntyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_AssignmentExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_AssignmentExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_AssignmentExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_AssignmentExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_BinaryIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_BinaryIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_BinaryIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_BinaryIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_BinaryLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_BinaryLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_BinaryLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_BinaryLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_BooleanLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_BooleanLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_BooleanLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_BooleanLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_CastExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_CastExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_CastExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_CastExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_CharacterLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_CharacterLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_CharacterLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_CharacterLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_ClassTypeConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_ClassTypeConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_ClassTypeConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_ClassTypeConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_ConditionalAndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_ConditionalAndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_ConditionalAndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_ConditionalAndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_ConditionalExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_ConditionalExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_ConditionalExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_ConditionalExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_ConditionalOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_ConditionalOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_ConditionalOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_ConditionalOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_DecimalDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_DecimalDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_DecimalDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_DecimalDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_DecimalFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_DecimalFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_DecimalFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_DecimalFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_DecimalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_DecimalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_DecimalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_DecimalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_DecimalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_DecimalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_DecimalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_DecimalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_EqualityExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_EqualityExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_EqualityExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_EqualityExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_ExclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_ExclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_ExclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_ExclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_ExplicitConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_ExplicitConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_ExplicitConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_ExplicitConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_HexDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_HexDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_HexDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_HexDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_HexFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_HexFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_HexFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_HexFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_HexIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_HexIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_HexIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_HexIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_HexLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_HexLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_HexLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_HexLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_InclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_InclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_InclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_InclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_InstanceOfExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_InstanceOfExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_InstanceOfExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_InstanceOfExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_LambdaExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_LambdaExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_LambdaExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_LambdaExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_MultiplicativeExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_MultiplicativeExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_MultiplicativeExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_MultiplicativeExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_NestedExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_NestedExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_NestedExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_NestedExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_NewConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_NewConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_NewConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_NewConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_NewConstructorCallWithInferredTypeArguments.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_NewConstructorCallWithInferredTypeArguments.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_NewConstructorCallWithInferredTypeArguments.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_NewConstructorCallWithInferredTypeArguments.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_NullLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_NullLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_NullLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_NullLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_OctalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_OctalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_OctalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_OctalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_OctalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_OctalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_OctalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_OctalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_PrefixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_PrefixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_PrefixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_PrefixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_PrimaryExpressionReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_PrimaryExpressionReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_PrimaryExpressionReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_PrimaryExpressionReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_PrimitiveTypeReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_PrimitiveTypeReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_PrimitiveTypeReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_PrimitiveTypeReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_ReflectiveClassReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_ReflectiveClassReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_ReflectiveClassReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_ReflectiveClassReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_RelationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_RelationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_RelationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_RelationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_SelfReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_SelfReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_SelfReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_SelfReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_ShiftExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_ShiftExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_ShiftExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_ShiftExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_StringReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_StringReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_StringReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_StringReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_SuffixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_SuffixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_SuffixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_SuffixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_TextBlockReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_TextBlockReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_TextBlockReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_TextBlockReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_UnaryExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_UnaryExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/ctool16/CreateYieldStatement_yieldExpression_UnaryExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/ctool16/CreateYieldStatement_yieldExpression_UnaryExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Abstract.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Abstract.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Abstract.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Abstract.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Addition.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Addition.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Addition.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Addition.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/AdditionalField.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/AdditionalField.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/AdditionalField.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/AdditionalField.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/AdditionalLocalVariable.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/AdditionalLocalVariable.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/AdditionalLocalVariable.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/AdditionalLocalVariable.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/AdditiveExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/AdditiveExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/AdditiveExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/AdditiveExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/AndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/AndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/AndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/AndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Annotation.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Annotation.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Annotation.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Annotation.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/AnnotationAttributeSetting.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/AnnotationAttributeSetting.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/AnnotationAttributeSetting.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/AnnotationAttributeSetting.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/AnnotationInstance.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/AnnotationInstance.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/AnnotationInstance.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/AnnotationInstance.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/AnnotationParameterList.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/AnnotationParameterList.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/AnnotationParameterList.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/AnnotationParameterList.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/AnonymousClass.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/AnonymousClass.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/AnonymousClass.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/AnonymousClass.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/ArrayConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ArrayConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/ArrayConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ArrayConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/ArrayDimension.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ArrayDimension.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/ArrayDimension.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ArrayDimension.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/ArrayInitializer.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ArrayInitializer.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/ArrayInitializer.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ArrayInitializer.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/ArrayInstantiationBySize.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ArrayInstantiationBySize.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/ArrayInstantiationBySize.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ArrayInstantiationBySize.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/ArrayInstantiationByValuesTyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ArrayInstantiationByValuesTyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/ArrayInstantiationByValuesTyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ArrayInstantiationByValuesTyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/ArrayInstantiationByValuesUntyped.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ArrayInstantiationByValuesUntyped.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/ArrayInstantiationByValuesUntyped.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ArrayInstantiationByValuesUntyped.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/ArraySelector.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ArraySelector.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/ArraySelector.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ArraySelector.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Assert.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Assert.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Assert.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Assert.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Assignment.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Assignment.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Assignment.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Assignment.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/AssignmentAnd.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/AssignmentAnd.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/AssignmentAnd.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/AssignmentAnd.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/AssignmentDivision.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/AssignmentDivision.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/AssignmentDivision.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/AssignmentDivision.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/AssignmentExclusiveOr.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/AssignmentExclusiveOr.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/AssignmentExclusiveOr.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/AssignmentExclusiveOr.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/AssignmentExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/AssignmentExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/AssignmentExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/AssignmentExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/AssignmentLeftShift.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/AssignmentLeftShift.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/AssignmentLeftShift.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/AssignmentLeftShift.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/AssignmentMinus.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/AssignmentMinus.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/AssignmentMinus.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/AssignmentMinus.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/AssignmentModulo.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/AssignmentModulo.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/AssignmentModulo.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/AssignmentModulo.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/AssignmentMultiplication.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/AssignmentMultiplication.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/AssignmentMultiplication.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/AssignmentMultiplication.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/AssignmentOr.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/AssignmentOr.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/AssignmentOr.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/AssignmentOr.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/AssignmentPlus.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/AssignmentPlus.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/AssignmentPlus.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/AssignmentPlus.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/AssignmentRightShift.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/AssignmentRightShift.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/AssignmentRightShift.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/AssignmentRightShift.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/AssignmentUnsignedRightShift.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/AssignmentUnsignedRightShift.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/AssignmentUnsignedRightShift.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/AssignmentUnsignedRightShift.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/AttributeLayoutInformation.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/AttributeLayoutInformation.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/AttributeLayoutInformation.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/AttributeLayoutInformation.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/BinaryIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/BinaryIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/BinaryIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/BinaryIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/BinaryLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/BinaryLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/BinaryLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/BinaryLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Block.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Block.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Block.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Block.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Boolean.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Boolean.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Boolean.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Boolean.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/BooleanLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/BooleanLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/BooleanLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/BooleanLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Break.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Break.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Break.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Break.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Byte.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Byte.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Byte.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Byte.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/CastExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/CastExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/CastExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/CastExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/CatchBlock.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/CatchBlock.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/CatchBlock.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/CatchBlock.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/CatchParameter.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/CatchParameter.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/CatchParameter.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/CatchParameter.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Char.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Char.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Char.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Char.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/CharacterLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/CharacterLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/CharacterLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/CharacterLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Class.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Class.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Class.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Class.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/ClassMethod.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ClassMethod.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/ClassMethod.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ClassMethod.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/ClassTypeConstructorReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ClassTypeConstructorReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/ClassTypeConstructorReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ClassTypeConstructorReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/ClassifierImport.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ClassifierImport.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/ClassifierImport.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ClassifierImport.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/ClassifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ClassifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/ClassifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ClassifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/CompilationUnit.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/CompilationUnit.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/CompilationUnit.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/CompilationUnit.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Complement.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Complement.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Complement.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Complement.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Condition.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Condition.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Condition.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Condition.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/ConditionalAndExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ConditionalAndExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/ConditionalAndExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ConditionalAndExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/ConditionalExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ConditionalExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/ConditionalExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ConditionalExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/ConditionalOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ConditionalOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/ConditionalOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ConditionalOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Constructor.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Constructor.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Constructor.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Constructor.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Continue.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Continue.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Continue.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Continue.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/DecimalDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/DecimalDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/DecimalDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/DecimalDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/DecimalFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/DecimalFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/DecimalFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/DecimalFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/DecimalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/DecimalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/DecimalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/DecimalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/DecimalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/DecimalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/DecimalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/DecimalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Default.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Default.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Default.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Default.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/DefaultSwitchCase.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/DefaultSwitchCase.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/DefaultSwitchCase.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/DefaultSwitchCase.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/DefaultSwitchRule.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/DefaultSwitchRule.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/DefaultSwitchRule.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/DefaultSwitchRule.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Division.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Division.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Division.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Division.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/DoWhileLoop.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/DoWhileLoop.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/DoWhileLoop.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/DoWhileLoop.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Double.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Double.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Double.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Double.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/EmptyMember.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/EmptyMember.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/EmptyMember.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/EmptyMember.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/EmptyModel.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/EmptyModel.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/EmptyModel.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/EmptyModel.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/EmptyStatement.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/EmptyStatement.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/EmptyStatement.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/EmptyStatement.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/EnumConstant.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/EnumConstant.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/EnumConstant.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/EnumConstant.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Enumeration.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Enumeration.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Enumeration.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Enumeration.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Equal.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Equal.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Equal.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Equal.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/EqualityExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/EqualityExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/EqualityExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/EqualityExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/ExclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ExclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/ExclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ExclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/ExplicitConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ExplicitConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/ExplicitConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ExplicitConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/ExplicitlyTypedLambdaParameters.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ExplicitlyTypedLambdaParameters.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/ExplicitlyTypedLambdaParameters.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ExplicitlyTypedLambdaParameters.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/ExportsModuleDirective.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ExportsModuleDirective.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/ExportsModuleDirective.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ExportsModuleDirective.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/ExpressionList.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ExpressionList.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/ExpressionList.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ExpressionList.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/ExpressionStatement.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ExpressionStatement.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/ExpressionStatement.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ExpressionStatement.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/ExtendsTypeArgument.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ExtendsTypeArgument.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/ExtendsTypeArgument.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ExtendsTypeArgument.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Field.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Field.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Field.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Field.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Final.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Final.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Final.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Final.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Float.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Float.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Float.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Float.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/ForEachLoop.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ForEachLoop.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/ForEachLoop.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ForEachLoop.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/ForLoop.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ForLoop.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/ForLoop.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ForLoop.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/GreaterThan.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/GreaterThan.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/GreaterThan.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/GreaterThan.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/GreaterThanOrEqual.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/GreaterThanOrEqual.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/GreaterThanOrEqual.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/GreaterThanOrEqual.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/HexDoubleLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/HexDoubleLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/HexDoubleLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/HexDoubleLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/HexFloatLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/HexFloatLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/HexFloatLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/HexFloatLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/HexIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/HexIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/HexIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/HexIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/HexLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/HexLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/HexLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/HexLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/IdentifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/IdentifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/IdentifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/IdentifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/ImplicitlyTypedLambdaParameters.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ImplicitlyTypedLambdaParameters.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/ImplicitlyTypedLambdaParameters.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ImplicitlyTypedLambdaParameters.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/InclusiveOrExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/InclusiveOrExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/InclusiveOrExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/InclusiveOrExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/InferableType.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/InferableType.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/InferableType.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/InferableType.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/InstanceOfExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/InstanceOfExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/InstanceOfExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/InstanceOfExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Int.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Int.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Int.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Int.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Interface.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Interface.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Interface.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Interface.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/InterfaceMethod.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/InterfaceMethod.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/InterfaceMethod.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/InterfaceMethod.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/JumpLabel.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/JumpLabel.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/JumpLabel.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/JumpLabel.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/KeywordLayoutInformation.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/KeywordLayoutInformation.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/KeywordLayoutInformation.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/KeywordLayoutInformation.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/LambdaExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/LambdaExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/LambdaExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/LambdaExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/LeftShift.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/LeftShift.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/LeftShift.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/LeftShift.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/LessThan.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/LessThan.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/LessThan.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/LessThan.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/LessThanOrEqual.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/LessThanOrEqual.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/LessThanOrEqual.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/LessThanOrEqual.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/LocalVariable.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/LocalVariable.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/LocalVariable.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/LocalVariable.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/LocalVariableStatement.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/LocalVariableStatement.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/LocalVariableStatement.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/LocalVariableStatement.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Long.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Long.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Long.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Long.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/MethodCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/MethodCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/MethodCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/MethodCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/MinimalLayoutInformation.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/MinimalLayoutInformation.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/MinimalLayoutInformation.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/MinimalLayoutInformation.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/MinusMinus.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/MinusMinus.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/MinusMinus.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/MinusMinus.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/ModuleReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ModuleReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/ModuleReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ModuleReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Multiplication.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Multiplication.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Multiplication.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Multiplication.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/MultiplicativeExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/MultiplicativeExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/MultiplicativeExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/MultiplicativeExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/NamespaceClassifierReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/NamespaceClassifierReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/NamespaceClassifierReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/NamespaceClassifierReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Native.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Native.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Native.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Native.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Negate.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Negate.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Negate.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Negate.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/NestedExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/NestedExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/NestedExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/NestedExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/NewConstructorCall.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/NewConstructorCall.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/NewConstructorCall.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/NewConstructorCall.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/NewConstructorCallWithInferredTypeArguments.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/NewConstructorCallWithInferredTypeArguments.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/NewConstructorCallWithInferredTypeArguments.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/NewConstructorCallWithInferredTypeArguments.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/NormalSwitchCase.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/NormalSwitchCase.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/NormalSwitchCase.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/NormalSwitchCase.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/NormalSwitchRule.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/NormalSwitchRule.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/NormalSwitchRule.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/NormalSwitchRule.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/NotEqual.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/NotEqual.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/NotEqual.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/NotEqual.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/NullLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/NullLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/NullLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/NullLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/OctalIntegerLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/OctalIntegerLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/OctalIntegerLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/OctalIntegerLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/OctalLongLiteral.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/OctalLongLiteral.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/OctalLongLiteral.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/OctalLongLiteral.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Open.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Open.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Open.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Open.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/OpensModuleDirective.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/OpensModuleDirective.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/OpensModuleDirective.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/OpensModuleDirective.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/OrdinaryParameter.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/OrdinaryParameter.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/OrdinaryParameter.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/OrdinaryParameter.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Package.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Package.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Package.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Package.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/PackageImport.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/PackageImport.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/PackageImport.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/PackageImport.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/PackageReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/PackageReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/PackageReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/PackageReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/PlusPlus.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/PlusPlus.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/PlusPlus.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/PlusPlus.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/PrefixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/PrefixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/PrefixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/PrefixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/PrimaryExpressionReferenceExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/PrimaryExpressionReferenceExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/PrimaryExpressionReferenceExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/PrimaryExpressionReferenceExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/PrimitiveTypeReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/PrimitiveTypeReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/PrimitiveTypeReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/PrimitiveTypeReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Private.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Private.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Private.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Private.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Protected.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Protected.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Protected.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Protected.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/ProvidesModuleDirective.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ProvidesModuleDirective.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/ProvidesModuleDirective.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ProvidesModuleDirective.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Public.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Public.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Public.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Public.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/QualifiedTypeArgument.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/QualifiedTypeArgument.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/QualifiedTypeArgument.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/QualifiedTypeArgument.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/ReceiverParameter.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ReceiverParameter.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/ReceiverParameter.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ReceiverParameter.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/ReferenceLayoutInformation.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ReferenceLayoutInformation.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/ReferenceLayoutInformation.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ReferenceLayoutInformation.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/ReflectiveClassReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ReflectiveClassReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/ReflectiveClassReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ReflectiveClassReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/RelationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/RelationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/RelationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/RelationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Remainder.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Remainder.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Remainder.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Remainder.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/RequiresModuleDirective.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/RequiresModuleDirective.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/RequiresModuleDirective.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/RequiresModuleDirective.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Return.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Return.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Return.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Return.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/RightShift.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/RightShift.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/RightShift.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/RightShift.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/SelfReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/SelfReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/SelfReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/SelfReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/ShiftExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ShiftExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/ShiftExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/ShiftExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Short.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Short.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Short.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Short.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/SingleAnnotationParameter.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/SingleAnnotationParameter.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/SingleAnnotationParameter.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/SingleAnnotationParameter.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/SingleImplicitLambdaParameter.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/SingleImplicitLambdaParameter.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/SingleImplicitLambdaParameter.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/SingleImplicitLambdaParameter.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Static.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Static.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Static.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Static.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/StaticClassifierImport.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/StaticClassifierImport.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/StaticClassifierImport.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/StaticClassifierImport.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/StaticMemberImport.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/StaticMemberImport.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/StaticMemberImport.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/StaticMemberImport.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Strictfp.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Strictfp.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Strictfp.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Strictfp.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/StringReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/StringReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/StringReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/StringReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Subtraction.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Subtraction.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Subtraction.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Subtraction.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/SuffixUnaryModificationExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/SuffixUnaryModificationExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/SuffixUnaryModificationExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/SuffixUnaryModificationExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Super.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Super.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Super.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Super.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/SuperTypeArgument.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/SuperTypeArgument.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/SuperTypeArgument.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/SuperTypeArgument.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Switch.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Switch.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Switch.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Switch.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Synchronized.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Synchronized.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Synchronized.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Synchronized.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/SynchronizedBlock.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/SynchronizedBlock.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/SynchronizedBlock.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/SynchronizedBlock.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/TextBlockReference.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/TextBlockReference.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/TextBlockReference.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/TextBlockReference.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/This.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/This.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/This.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/This.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Throw.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Throw.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Throw.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Throw.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Transient.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Transient.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Transient.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Transient.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Transitive.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Transitive.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Transitive.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Transitive.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/TryBlock.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/TryBlock.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/TryBlock.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/TryBlock.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/TypeParameter.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/TypeParameter.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/TypeParameter.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/TypeParameter.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/UnaryExpression.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/UnaryExpression.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/UnaryExpression.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/UnaryExpression.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/UnknownTypeArgument.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/UnknownTypeArgument.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/UnknownTypeArgument.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/UnknownTypeArgument.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/UnsignedRightShift.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/UnsignedRightShift.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/UnsignedRightShift.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/UnsignedRightShift.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/UsesModuleDirective.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/UsesModuleDirective.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/UsesModuleDirective.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/UsesModuleDirective.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/VariableLengthParameter.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/VariableLengthParameter.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/VariableLengthParameter.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/VariableLengthParameter.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Void.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Void.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Void.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Void.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/Volatile.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Volatile.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/Volatile.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/Volatile.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/WhileLoop.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/WhileLoop.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/WhileLoop.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/WhileLoop.gif diff --git a/bundles/org.emftext.language.java.edit/icons/full/obj16/YieldStatement.gif b/bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/YieldStatement.gif similarity index 100% rename from bundles/org.emftext.language.java.edit/icons/full/obj16/YieldStatement.gif rename to bundles/org.emftext.language.java.edit/src/main/resources/icons/full/obj16/YieldStatement.gif diff --git a/bundles/org.emftext.language.java.edit/plugin.properties b/bundles/org.emftext.language.java.edit/src/main/resources/plugin.properties similarity index 98% rename from bundles/org.emftext.language.java.edit/plugin.properties rename to bundles/org.emftext.language.java.edit/src/main/resources/plugin.properties index eba7e9a7..e7ac84ec 100644 --- a/bundles/org.emftext.language.java.edit/plugin.properties +++ b/bundles/org.emftext.language.java.edit/src/main/resources/plugin.properties @@ -12,11 +12,11 @@ # DevBoost GmbH - Berlin, Germany # - initial API and implementation # Martin Armbruster -# - Extension for Java 7-13 +# - Adaptation and extension for Java 7+ # -pluginName = JaMoPP (Java Model Parser and Printer) Metamodel Edit Support -providerName = Martin Armbruster +pluginName = Java Edit Support +providerName = www.example.org _UI_CreateChild_text = {0} _UI_CreateChild_text2 = {1} {0} @@ -237,6 +237,8 @@ _UI_ReflectiveClassReference_type = Reflective Class Reference _UI_PrimitiveTypeReference_type = Primitive Type Reference _UI_StringReference_type = String Reference _UI_SelfReference_type = Self Reference +_UI_TextBlockReference_type = Text Block Reference +_UI_PackageReference_type = Package Reference _UI_StatementContainer_type = Statement Container _UI_StatementListContainer_type = Statement List Container _UI_Conditional_type = Conditional @@ -272,6 +274,7 @@ _UI_DefaultSwitchRule_type = Default Switch Rule _UI_NormalSwitchRule_type = Normal Switch Rule _UI_Type_type = Type _UI_TypedElement_type = Typed Element +_UI_TypedElementExtension_type = Typed Element Extension _UI_TypeReference_type = Type Reference _UI_ClassifierReference_type = Classifier Reference _UI_NamespaceClassifierReference_type = Namespace Classifier Reference @@ -298,6 +301,11 @@ _UI_RequiresModuleDirective_type = Requires Module Directive _UI_OpensModuleDirective_type = Opens Module Directive _UI_ExportsModuleDirective_type = Exports Module Directive _UI_ModuleReference_type = Module Reference +_UI_LayoutInformation_type = Information +_UI_ReferenceLayoutInformation_type = Reference Layout Information +_UI_AttributeLayoutInformation_type = Attribute Layout Information +_UI_KeywordLayoutInformation_type = Keyword Layout Information +_UI_MinimalLayoutInformation_type = Minimal Layout Information _UI_Unknown_type = Object _UI_Unknown_datatype= Value @@ -325,6 +333,7 @@ _UI_Enumeration_constants_feature = Constants _UI_Commentable_layoutInformations_feature = Layout Informations _UI_NamedElement_name_feature = Name _UI_NamespaceAwareElement_namespaces_feature = Namespaces +_UI_JavaRoot_origin_feature = Origin _UI_CompilationUnit_classifiers_feature = Classifiers _UI_Package_module_feature = Module _UI_Package_classifiers_feature = Classifiers @@ -408,9 +417,11 @@ _UI_Reference_next_feature = Next _UI_Reference_arraySelectors_feature = Array Selectors _UI_Argumentable_arguments_feature = Arguments _UI_ElementReference_target_feature = Target +_UI_ElementReference_containedTarget_feature = Contained Target _UI_PrimitiveTypeReference_primitiveType_feature = Primitive Type _UI_StringReference_value_feature = Value _UI_SelfReference_self_feature = Self +_UI_TextBlockReference_value_feature = Value _UI_StatementContainer_statement_feature = Statement _UI_Conditional_condition_feature = Condition _UI_SwitchCase_statements_feature = Statements @@ -438,9 +449,9 @@ _UI_BlockContainer_block_feature = Block _UI_YieldStatement_yieldExpression_feature = Yield Expression _UI_NormalSwitchRule_additionalConditions_feature = Additional Conditions _UI_TypedElement_typeReference_feature = Type Reference +_UI_TypedElementExtension_actualTargets_feature = Actual Targets _UI_ClassifierReference_target_feature = Target _UI_NamespaceClassifierReference_classifierReferences_feature = Classifier References -_UI_InferableType_actualTargets_feature = Actual Targets _UI_LocalVariable_additionalLocalVariables_feature = Additional Local Variables _UI_ProvidesModuleDirective_serviceProviders_feature = Service Providers _UI_AccessProvidingModuleDirective_modules_feature = Modules @@ -448,18 +459,6 @@ _UI_AccessProvidingModuleDirective_accessablePackage_feature = Accessable Packag _UI_RequiresModuleDirective_modifier_feature = Modifier _UI_RequiresModuleDirective_requiredModule_feature = Required Module _UI_ModuleReference_target_feature = Target -_UI_Unknown_feature = Unspecified - -_UI_TextBlockReference_type = Text Block Reference -_UI_TextBlockReference_value_feature = Value -_UI_PackageReference_type = Package Reference -_UI_ElementReference_containedTarget_feature = Contained Target -_UI_AccessProvidingModuleDirective_accessablePackageReference_feature = Accessable Package Reference -_UI_LayoutInformation_type = Information -_UI_ReferenceLayoutInformation_type = Reference Layout Information -_UI_AttributeLayoutInformation_type = Attribute Layout Information -_UI_KeywordLayoutInformation_type = Keyword Layout Information -_UI_MinimalLayoutInformation_type = Minimal Layout Information _UI_LayoutInformation_startOffset_feature = Start Offset _UI_LayoutInformation_hiddenTokenText_feature = Hidden Token Text _UI_LayoutInformation_visibleTokenText_feature = Visible Token Text @@ -467,11 +466,8 @@ _UI_LayoutInformation_syntaxElementID_feature = Syntax Element ID _UI_ReferenceLayoutInformation_object_feature = Object _UI_MinimalLayoutInformation_length_feature = Length _UI_MinimalLayoutInformation_rootLayout_feature = Root Layout -_UI_InferredTypeArgumentable_type = Inferred Type Argumentable -_UI_InferredTypeArgumentable_inferredTypeArguments_feature = Inferred Type Arguments -_UI_TypedElementExtension_type = Typed Element Extension -_UI_TypedElementExtension_actualTargets_feature = Actual Targets -_UI_JavaRoot_origin_feature = Origin +_UI_Unknown_feature = Unspecified + _UI_Origin_FILE_literal = FILE _UI_Origin_CLASS_literal = CLASS _UI_Origin_ARCHIVE_literal = ARCHIVE diff --git a/bundles/org.emftext.language.java.edit/plugin.xml b/bundles/org.emftext.language.java.edit/src/main/resources/plugin.xml similarity index 98% rename from bundles/org.emftext.language.java.edit/plugin.xml rename to bundles/org.emftext.language.java.edit/src/main/resources/plugin.xml index a944f3e8..42c24702 100644 --- a/bundles/org.emftext.language.java.edit/plugin.xml +++ b/bundles/org.emftext.language.java.edit/src/main/resources/plugin.xml @@ -16,7 +16,7 @@ DevBoost GmbH - Berlin, Germany - initial API and implementation Martin Armbruster - - Extension for Java 7-13 + - Adaptation and extension for Java 7+ --> @@ -31,8 +31,6 @@ - - diff --git a/bundles/org.emftext.language.java.editor/.classpath b/bundles/org.emftext.language.java.editor/.classpath deleted file mode 100644 index 2377d859..00000000 --- a/bundles/org.emftext.language.java.editor/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/bundles/org.emftext.language.java.editor/.gitignore b/bundles/org.emftext.language.java.editor/.gitignore new file mode 100644 index 00000000..7c1731c2 --- /dev/null +++ b/bundles/org.emftext.language.java.editor/.gitignore @@ -0,0 +1 @@ +/src/main/generated diff --git a/bundles/org.emftext.language.java.editor/.project b/bundles/org.emftext.language.java.editor/.project deleted file mode 100644 index 08104a58..00000000 --- a/bundles/org.emftext.language.java.editor/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - org.emftext.language.java.editor - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - net.sf.eclipsecs.core.CheckstyleBuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.pde.PluginNature - net.sf.eclipsecs.core.CheckstyleNature - - diff --git a/bundles/org.emftext.language.java.editor/META-INF/MANIFEST.MF b/bundles/org.emftext.language.java.editor/META-INF/MANIFEST.MF deleted file mode 100644 index eeb9f6a9..00000000 --- a/bundles/org.emftext.language.java.editor/META-INF/MANIFEST.MF +++ /dev/null @@ -1,39 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: JaMoPP (Java Model Parser and Printer) Metamodel Editor -Bundle-SymbolicName: org.emftext.language.java.editor;singleton:=true -Automatic-Module-Name: org.emftext.language.java.editor -Bundle-Version: 5.1.0.qualifier -Bundle-ClassPath: . -Bundle-Activator: org.emftext.language.java.annotations.presentation.JavaEditorPlugin$Implementation -Bundle-Vendor: Martin Armbruster -Bundle-Localization: plugin -Export-Package: org.emftext.commons.layout.presentation, - org.emftext.language.java.annotations.presentation, - org.emftext.language.java.arrays.presentation, - org.emftext.language.java.classifiers.presentation, - org.emftext.language.java.containers.presentation, - org.emftext.language.java.expressions.presentation, - org.emftext.language.java.generics.presentation, - org.emftext.language.java.imports.presentation, - org.emftext.language.java.instantiations.presentation, - org.emftext.language.java.literals.presentation, - org.emftext.language.java.members.presentation, - org.emftext.language.java.modifiers.presentation, - org.emftext.language.java.modules.presentation, - org.emftext.language.java.operators.presentation, - org.emftext.language.java.parameters.presentation, - org.emftext.language.java.references.presentation, - org.emftext.language.java.statements.presentation, - org.emftext.language.java.types.presentation, - org.emftext.language.java.variables.presentation -Bundle-RequiredExecutionEnvironment: JavaSE-17 -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.core.resources, - org.emftext.language.java.edit, - org.eclipse.emf.ecore.xmi, - org.eclipse.emf.edit.ui, - org.eclipse.ui.ide, - org.emftext.language.java -Bundle-ActivationPolicy: lazy - diff --git a/bundles/org.emftext.language.java.editor/build.properties b/bundles/org.emftext.language.java.editor/build.properties deleted file mode 100644 index b78c470b..00000000 --- a/bundles/org.emftext.language.java.editor/build.properties +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright (c) 2006-2014 -# Software Technology Group, Dresden University of Technology -# DevBoost GmbH, Berlin, Amtsgericht Charlottenburg, HRB 140026 -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Software Technology Group - TU Dresden, Germany; -# DevBoost GmbH - Berlin, Germany -# - initial API and implementation -# Martin Armbruster -# - Extension for Java 7-13 -# - -bin.includes = .,\ - icons/,\ - META-INF/,\ - plugin.xml,\ - plugin.properties -jars.compile.order = . -source.. = src-gen/ -output.. = bin diff --git a/bundles/org.emftext.language.java.editor/pom.xml b/bundles/org.emftext.language.java.editor/pom.xml new file mode 100644 index 00000000..27e7d5d7 --- /dev/null +++ b/bundles/org.emftext.language.java.editor/pom.xml @@ -0,0 +1,61 @@ + + + + 4.0.0 + org.emftext.language.java.editor + jar + JaMoPP (Java Model Parser and Printer) Metamodel Editor + + + tools.mdsd + jamopp.bundles + 6.0.0-SNAPSHOT + + + + + + org.apache.felix + maven-bundle-plugin + + + + bundle + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + generate-sources + + add-source + + + + src/main/generated + + + + + + + + + + + tools.mdsd + org.emftext.language.java.edit + 6.0.0-SNAPSHOT + + + org.eclipse.platform + org.eclipse.ui + + + diff --git a/bundles/org.emftext.language.java.editor/icons/full/obj16/AnnotationsModelFile.gif b/bundles/org.emftext.language.java.editor/src/resources/icons/full/obj16/AnnotationsModelFile.gif similarity index 100% rename from bundles/org.emftext.language.java.editor/icons/full/obj16/AnnotationsModelFile.gif rename to bundles/org.emftext.language.java.editor/src/resources/icons/full/obj16/AnnotationsModelFile.gif diff --git a/bundles/org.emftext.language.java.editor/icons/full/obj16/ArraysModelFile.gif b/bundles/org.emftext.language.java.editor/src/resources/icons/full/obj16/ArraysModelFile.gif similarity index 100% rename from bundles/org.emftext.language.java.editor/icons/full/obj16/ArraysModelFile.gif rename to bundles/org.emftext.language.java.editor/src/resources/icons/full/obj16/ArraysModelFile.gif diff --git a/bundles/org.emftext.language.java.editor/icons/full/obj16/ClassifiersModelFile.gif b/bundles/org.emftext.language.java.editor/src/resources/icons/full/obj16/ClassifiersModelFile.gif similarity index 100% rename from bundles/org.emftext.language.java.editor/icons/full/obj16/ClassifiersModelFile.gif rename to bundles/org.emftext.language.java.editor/src/resources/icons/full/obj16/ClassifiersModelFile.gif diff --git a/bundles/org.emftext.language.java.editor/icons/full/obj16/ContainersModelFile.gif b/bundles/org.emftext.language.java.editor/src/resources/icons/full/obj16/ContainersModelFile.gif similarity index 100% rename from bundles/org.emftext.language.java.editor/icons/full/obj16/ContainersModelFile.gif rename to bundles/org.emftext.language.java.editor/src/resources/icons/full/obj16/ContainersModelFile.gif diff --git a/bundles/org.emftext.language.java.editor/icons/full/obj16/ExpressionsModelFile.gif b/bundles/org.emftext.language.java.editor/src/resources/icons/full/obj16/ExpressionsModelFile.gif similarity index 100% rename from bundles/org.emftext.language.java.editor/icons/full/obj16/ExpressionsModelFile.gif rename to bundles/org.emftext.language.java.editor/src/resources/icons/full/obj16/ExpressionsModelFile.gif diff --git a/bundles/org.emftext.language.java.editor/icons/full/obj16/GenericsModelFile.gif b/bundles/org.emftext.language.java.editor/src/resources/icons/full/obj16/GenericsModelFile.gif similarity index 100% rename from bundles/org.emftext.language.java.editor/icons/full/obj16/GenericsModelFile.gif rename to bundles/org.emftext.language.java.editor/src/resources/icons/full/obj16/GenericsModelFile.gif diff --git a/bundles/org.emftext.language.java.editor/icons/full/obj16/ImportsModelFile.gif b/bundles/org.emftext.language.java.editor/src/resources/icons/full/obj16/ImportsModelFile.gif similarity index 100% rename from bundles/org.emftext.language.java.editor/icons/full/obj16/ImportsModelFile.gif rename to bundles/org.emftext.language.java.editor/src/resources/icons/full/obj16/ImportsModelFile.gif diff --git a/bundles/org.emftext.language.java.editor/icons/full/obj16/InstantiationsModelFile.gif b/bundles/org.emftext.language.java.editor/src/resources/icons/full/obj16/InstantiationsModelFile.gif similarity index 100% rename from bundles/org.emftext.language.java.editor/icons/full/obj16/InstantiationsModelFile.gif rename to bundles/org.emftext.language.java.editor/src/resources/icons/full/obj16/InstantiationsModelFile.gif diff --git a/bundles/org.emftext.language.java.editor/icons/full/obj16/LayoutModelFile.gif b/bundles/org.emftext.language.java.editor/src/resources/icons/full/obj16/LayoutModelFile.gif similarity index 100% rename from bundles/org.emftext.language.java.editor/icons/full/obj16/LayoutModelFile.gif rename to bundles/org.emftext.language.java.editor/src/resources/icons/full/obj16/LayoutModelFile.gif diff --git a/bundles/org.emftext.language.java.editor/icons/full/obj16/LiteralsModelFile.gif b/bundles/org.emftext.language.java.editor/src/resources/icons/full/obj16/LiteralsModelFile.gif similarity index 100% rename from bundles/org.emftext.language.java.editor/icons/full/obj16/LiteralsModelFile.gif rename to bundles/org.emftext.language.java.editor/src/resources/icons/full/obj16/LiteralsModelFile.gif diff --git a/bundles/org.emftext.language.java.editor/icons/full/obj16/MembersModelFile.gif b/bundles/org.emftext.language.java.editor/src/resources/icons/full/obj16/MembersModelFile.gif similarity index 100% rename from bundles/org.emftext.language.java.editor/icons/full/obj16/MembersModelFile.gif rename to bundles/org.emftext.language.java.editor/src/resources/icons/full/obj16/MembersModelFile.gif diff --git a/bundles/org.emftext.language.java.editor/icons/full/obj16/ModifiersModelFile.gif b/bundles/org.emftext.language.java.editor/src/resources/icons/full/obj16/ModifiersModelFile.gif similarity index 100% rename from bundles/org.emftext.language.java.editor/icons/full/obj16/ModifiersModelFile.gif rename to bundles/org.emftext.language.java.editor/src/resources/icons/full/obj16/ModifiersModelFile.gif diff --git a/bundles/org.emftext.language.java.editor/icons/full/obj16/ModulesModelFile.gif b/bundles/org.emftext.language.java.editor/src/resources/icons/full/obj16/ModulesModelFile.gif similarity index 100% rename from bundles/org.emftext.language.java.editor/icons/full/obj16/ModulesModelFile.gif rename to bundles/org.emftext.language.java.editor/src/resources/icons/full/obj16/ModulesModelFile.gif diff --git a/bundles/org.emftext.language.java.editor/icons/full/obj16/OperatorsModelFile.gif b/bundles/org.emftext.language.java.editor/src/resources/icons/full/obj16/OperatorsModelFile.gif similarity index 100% rename from bundles/org.emftext.language.java.editor/icons/full/obj16/OperatorsModelFile.gif rename to bundles/org.emftext.language.java.editor/src/resources/icons/full/obj16/OperatorsModelFile.gif diff --git a/bundles/org.emftext.language.java.editor/icons/full/obj16/ParametersModelFile.gif b/bundles/org.emftext.language.java.editor/src/resources/icons/full/obj16/ParametersModelFile.gif similarity index 100% rename from bundles/org.emftext.language.java.editor/icons/full/obj16/ParametersModelFile.gif rename to bundles/org.emftext.language.java.editor/src/resources/icons/full/obj16/ParametersModelFile.gif diff --git a/bundles/org.emftext.language.java.editor/icons/full/obj16/ReferencesModelFile.gif b/bundles/org.emftext.language.java.editor/src/resources/icons/full/obj16/ReferencesModelFile.gif similarity index 100% rename from bundles/org.emftext.language.java.editor/icons/full/obj16/ReferencesModelFile.gif rename to bundles/org.emftext.language.java.editor/src/resources/icons/full/obj16/ReferencesModelFile.gif diff --git a/bundles/org.emftext.language.java.editor/icons/full/obj16/StatementsModelFile.gif b/bundles/org.emftext.language.java.editor/src/resources/icons/full/obj16/StatementsModelFile.gif similarity index 100% rename from bundles/org.emftext.language.java.editor/icons/full/obj16/StatementsModelFile.gif rename to bundles/org.emftext.language.java.editor/src/resources/icons/full/obj16/StatementsModelFile.gif diff --git a/bundles/org.emftext.language.java.editor/icons/full/obj16/TypesModelFile.gif b/bundles/org.emftext.language.java.editor/src/resources/icons/full/obj16/TypesModelFile.gif similarity index 100% rename from bundles/org.emftext.language.java.editor/icons/full/obj16/TypesModelFile.gif rename to bundles/org.emftext.language.java.editor/src/resources/icons/full/obj16/TypesModelFile.gif diff --git a/bundles/org.emftext.language.java.editor/icons/full/obj16/VariablesModelFile.gif b/bundles/org.emftext.language.java.editor/src/resources/icons/full/obj16/VariablesModelFile.gif similarity index 100% rename from bundles/org.emftext.language.java.editor/icons/full/obj16/VariablesModelFile.gif rename to bundles/org.emftext.language.java.editor/src/resources/icons/full/obj16/VariablesModelFile.gif diff --git a/bundles/org.emftext.language.java.editor/icons/full/wizban/NewAnnotations.gif b/bundles/org.emftext.language.java.editor/src/resources/icons/full/wizban/NewAnnotations.gif similarity index 100% rename from bundles/org.emftext.language.java.editor/icons/full/wizban/NewAnnotations.gif rename to bundles/org.emftext.language.java.editor/src/resources/icons/full/wizban/NewAnnotations.gif diff --git a/bundles/org.emftext.language.java.editor/icons/full/wizban/NewArrays.gif b/bundles/org.emftext.language.java.editor/src/resources/icons/full/wizban/NewArrays.gif similarity index 100% rename from bundles/org.emftext.language.java.editor/icons/full/wizban/NewArrays.gif rename to bundles/org.emftext.language.java.editor/src/resources/icons/full/wizban/NewArrays.gif diff --git a/bundles/org.emftext.language.java.editor/icons/full/wizban/NewClassifiers.gif b/bundles/org.emftext.language.java.editor/src/resources/icons/full/wizban/NewClassifiers.gif similarity index 100% rename from bundles/org.emftext.language.java.editor/icons/full/wizban/NewClassifiers.gif rename to bundles/org.emftext.language.java.editor/src/resources/icons/full/wizban/NewClassifiers.gif diff --git a/bundles/org.emftext.language.java.editor/icons/full/wizban/NewContainers.gif b/bundles/org.emftext.language.java.editor/src/resources/icons/full/wizban/NewContainers.gif similarity index 100% rename from bundles/org.emftext.language.java.editor/icons/full/wizban/NewContainers.gif rename to bundles/org.emftext.language.java.editor/src/resources/icons/full/wizban/NewContainers.gif diff --git a/bundles/org.emftext.language.java.editor/icons/full/wizban/NewExpressions.gif b/bundles/org.emftext.language.java.editor/src/resources/icons/full/wizban/NewExpressions.gif similarity index 100% rename from bundles/org.emftext.language.java.editor/icons/full/wizban/NewExpressions.gif rename to bundles/org.emftext.language.java.editor/src/resources/icons/full/wizban/NewExpressions.gif diff --git a/bundles/org.emftext.language.java.editor/icons/full/wizban/NewGenerics.gif b/bundles/org.emftext.language.java.editor/src/resources/icons/full/wizban/NewGenerics.gif similarity index 100% rename from bundles/org.emftext.language.java.editor/icons/full/wizban/NewGenerics.gif rename to bundles/org.emftext.language.java.editor/src/resources/icons/full/wizban/NewGenerics.gif diff --git a/bundles/org.emftext.language.java.editor/icons/full/wizban/NewImports.gif b/bundles/org.emftext.language.java.editor/src/resources/icons/full/wizban/NewImports.gif similarity index 100% rename from bundles/org.emftext.language.java.editor/icons/full/wizban/NewImports.gif rename to bundles/org.emftext.language.java.editor/src/resources/icons/full/wizban/NewImports.gif diff --git a/bundles/org.emftext.language.java.editor/icons/full/wizban/NewInstantiations.gif b/bundles/org.emftext.language.java.editor/src/resources/icons/full/wizban/NewInstantiations.gif similarity index 100% rename from bundles/org.emftext.language.java.editor/icons/full/wizban/NewInstantiations.gif rename to bundles/org.emftext.language.java.editor/src/resources/icons/full/wizban/NewInstantiations.gif diff --git a/bundles/org.emftext.language.java.editor/icons/full/wizban/NewLayout.gif b/bundles/org.emftext.language.java.editor/src/resources/icons/full/wizban/NewLayout.gif similarity index 100% rename from bundles/org.emftext.language.java.editor/icons/full/wizban/NewLayout.gif rename to bundles/org.emftext.language.java.editor/src/resources/icons/full/wizban/NewLayout.gif diff --git a/bundles/org.emftext.language.java.editor/icons/full/wizban/NewLiterals.gif b/bundles/org.emftext.language.java.editor/src/resources/icons/full/wizban/NewLiterals.gif similarity index 100% rename from bundles/org.emftext.language.java.editor/icons/full/wizban/NewLiterals.gif rename to bundles/org.emftext.language.java.editor/src/resources/icons/full/wizban/NewLiterals.gif diff --git a/bundles/org.emftext.language.java.editor/icons/full/wizban/NewMembers.gif b/bundles/org.emftext.language.java.editor/src/resources/icons/full/wizban/NewMembers.gif similarity index 100% rename from bundles/org.emftext.language.java.editor/icons/full/wizban/NewMembers.gif rename to bundles/org.emftext.language.java.editor/src/resources/icons/full/wizban/NewMembers.gif diff --git a/bundles/org.emftext.language.java.editor/icons/full/wizban/NewModifiers.gif b/bundles/org.emftext.language.java.editor/src/resources/icons/full/wizban/NewModifiers.gif similarity index 100% rename from bundles/org.emftext.language.java.editor/icons/full/wizban/NewModifiers.gif rename to bundles/org.emftext.language.java.editor/src/resources/icons/full/wizban/NewModifiers.gif diff --git a/bundles/org.emftext.language.java.editor/icons/full/wizban/NewModules.gif b/bundles/org.emftext.language.java.editor/src/resources/icons/full/wizban/NewModules.gif similarity index 100% rename from bundles/org.emftext.language.java.editor/icons/full/wizban/NewModules.gif rename to bundles/org.emftext.language.java.editor/src/resources/icons/full/wizban/NewModules.gif diff --git a/bundles/org.emftext.language.java.editor/icons/full/wizban/NewOperators.gif b/bundles/org.emftext.language.java.editor/src/resources/icons/full/wizban/NewOperators.gif similarity index 100% rename from bundles/org.emftext.language.java.editor/icons/full/wizban/NewOperators.gif rename to bundles/org.emftext.language.java.editor/src/resources/icons/full/wizban/NewOperators.gif diff --git a/bundles/org.emftext.language.java.editor/icons/full/wizban/NewParameters.gif b/bundles/org.emftext.language.java.editor/src/resources/icons/full/wizban/NewParameters.gif similarity index 100% rename from bundles/org.emftext.language.java.editor/icons/full/wizban/NewParameters.gif rename to bundles/org.emftext.language.java.editor/src/resources/icons/full/wizban/NewParameters.gif diff --git a/bundles/org.emftext.language.java.editor/icons/full/wizban/NewReferences.gif b/bundles/org.emftext.language.java.editor/src/resources/icons/full/wizban/NewReferences.gif similarity index 100% rename from bundles/org.emftext.language.java.editor/icons/full/wizban/NewReferences.gif rename to bundles/org.emftext.language.java.editor/src/resources/icons/full/wizban/NewReferences.gif diff --git a/bundles/org.emftext.language.java.editor/icons/full/wizban/NewStatements.gif b/bundles/org.emftext.language.java.editor/src/resources/icons/full/wizban/NewStatements.gif similarity index 100% rename from bundles/org.emftext.language.java.editor/icons/full/wizban/NewStatements.gif rename to bundles/org.emftext.language.java.editor/src/resources/icons/full/wizban/NewStatements.gif diff --git a/bundles/org.emftext.language.java.editor/icons/full/wizban/NewTypes.gif b/bundles/org.emftext.language.java.editor/src/resources/icons/full/wizban/NewTypes.gif similarity index 100% rename from bundles/org.emftext.language.java.editor/icons/full/wizban/NewTypes.gif rename to bundles/org.emftext.language.java.editor/src/resources/icons/full/wizban/NewTypes.gif diff --git a/bundles/org.emftext.language.java.editor/icons/full/wizban/NewVariables.gif b/bundles/org.emftext.language.java.editor/src/resources/icons/full/wizban/NewVariables.gif similarity index 100% rename from bundles/org.emftext.language.java.editor/icons/full/wizban/NewVariables.gif rename to bundles/org.emftext.language.java.editor/src/resources/icons/full/wizban/NewVariables.gif diff --git a/bundles/org.emftext.language.java.editor/plugin.properties b/bundles/org.emftext.language.java.editor/src/resources/plugin.properties similarity index 100% rename from bundles/org.emftext.language.java.editor/plugin.properties rename to bundles/org.emftext.language.java.editor/src/resources/plugin.properties diff --git a/bundles/org.emftext.language.java.editor/plugin.xml b/bundles/org.emftext.language.java.editor/src/resources/plugin.xml similarity index 100% rename from bundles/org.emftext.language.java.editor/plugin.xml rename to bundles/org.emftext.language.java.editor/src/resources/plugin.xml diff --git a/bundles/org.emftext.language.java/.checkstyle b/bundles/org.emftext.language.java/.checkstyle deleted file mode 100644 index 1845d588..00000000 --- a/bundles/org.emftext.language.java/.checkstyle +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/bundles/org.emftext.language.java/.classpath b/bundles/org.emftext.language.java/.classpath deleted file mode 100644 index 2bba9679..00000000 --- a/bundles/org.emftext.language.java/.classpath +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/bundles/org.emftext.language.java/.gitignore b/bundles/org.emftext.language.java/.gitignore new file mode 100644 index 00000000..7c1731c2 --- /dev/null +++ b/bundles/org.emftext.language.java/.gitignore @@ -0,0 +1 @@ +/src/main/generated diff --git a/bundles/org.emftext.language.java/.project b/bundles/org.emftext.language.java/.project deleted file mode 100644 index 82369a32..00000000 --- a/bundles/org.emftext.language.java/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - org.emftext.language.java - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - net.sf.eclipsecs.core.CheckstyleBuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.pde.PluginNature - net.sf.eclipsecs.core.CheckstyleNature - - diff --git a/bundles/org.emftext.language.java/META-INF/MANIFEST.MF b/bundles/org.emftext.language.java/META-INF/MANIFEST.MF deleted file mode 100644 index 2b5ddd0d..00000000 --- a/bundles/org.emftext.language.java/META-INF/MANIFEST.MF +++ /dev/null @@ -1,79 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: JaMoPP (Java Model Parser and Printer) Metamodel -Bundle-SymbolicName: org.emftext.language.java;singleton:=true -Bundle-Version: 5.1.0.qualifier -Bundle-ClassPath: . -Bundle-Vendor: Martin Armbruster -Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-17 -Automatic-Module-Name: org.emftext.language.java -Export-Package: jamopp.options, - org.emftext.commons.layout, - org.emftext.commons.layout.impl, - org.emftext.commons.layout.util, - org.emftext.language.java, - org.emftext.language.java.annotations, - org.emftext.language.java.annotations.impl, - org.emftext.language.java.annotations.util, - org.emftext.language.java.arrays, - org.emftext.language.java.arrays.impl, - org.emftext.language.java.arrays.util, - org.emftext.language.java.classifiers, - org.emftext.language.java.classifiers.impl, - org.emftext.language.java.classifiers.util, - org.emftext.language.java.commons, - org.emftext.language.java.commons.impl, - org.emftext.language.java.commons.util, - org.emftext.language.java.containers, - org.emftext.language.java.containers.impl, - org.emftext.language.java.containers.util, - org.emftext.language.java.expressions, - org.emftext.language.java.expressions.impl, - org.emftext.language.java.expressions.util, - org.emftext.language.java.extensions.members, - org.emftext.language.java.extensions.types, - org.emftext.language.java.generics, - org.emftext.language.java.generics.impl, - org.emftext.language.java.generics.util, - org.emftext.language.java.impl, - org.emftext.language.java.imports, - org.emftext.language.java.imports.impl, - org.emftext.language.java.imports.util, - org.emftext.language.java.instantiations, - org.emftext.language.java.instantiations.impl, - org.emftext.language.java.instantiations.util, - org.emftext.language.java.literals, - org.emftext.language.java.literals.impl, - org.emftext.language.java.literals.util, - org.emftext.language.java.members, - org.emftext.language.java.members.impl, - org.emftext.language.java.members.util, - org.emftext.language.java.modifiers, - org.emftext.language.java.modifiers.impl, - org.emftext.language.java.modifiers.util, - org.emftext.language.java.modules, - org.emftext.language.java.modules.impl, - org.emftext.language.java.modules.util, - org.emftext.language.java.operators, - org.emftext.language.java.operators.impl, - org.emftext.language.java.operators.util, - org.emftext.language.java.parameters, - org.emftext.language.java.parameters.impl, - org.emftext.language.java.parameters.util, - org.emftext.language.java.references, - org.emftext.language.java.references.impl, - org.emftext.language.java.references.util, - org.emftext.language.java.statements, - org.emftext.language.java.statements.impl, - org.emftext.language.java.statements.util, - org.emftext.language.java.types, - org.emftext.language.java.types.impl, - org.emftext.language.java.types.util, - org.emftext.language.java.util, - org.emftext.language.java.variables, - org.emftext.language.java.variables.impl, - org.emftext.language.java.variables.util -Require-Bundle: org.eclipse.emf.ecore, - org.palladiosimulator.jdt.workflow;resolution:=optional -Bundle-ActivationPolicy: lazy diff --git a/bundles/org.emftext.language.java/build.properties b/bundles/org.emftext.language.java/build.properties deleted file mode 100644 index 6c67b670..00000000 --- a/bundles/org.emftext.language.java/build.properties +++ /dev/null @@ -1,15 +0,0 @@ - -# -# -# -# $Id$ - -bin.includes = .,\ - metamodel/,\ - META-INF/,\ - plugin.xml,\ - plugin.properties -jars.compile.order = . -source.. = src-gen/,\ - src/ -output.. = bin/ \ No newline at end of file diff --git a/bundles/org.emftext.language.java/pom.xml b/bundles/org.emftext.language.java/pom.xml new file mode 100644 index 00000000..e7945fb0 --- /dev/null +++ b/bundles/org.emftext.language.java/pom.xml @@ -0,0 +1,178 @@ + + + + 4.0.0 + org.emftext.language.java + jar + JaMoPP (Java Model Parser and Printer) Metamodel + + + tools.mdsd + jamopp.bundles + 6.0.0-SNAPSHOT + + + + + + org.codehaus.mojo + exec-maven-plugin + + + mwe2Launcher + generate-sources + + java + + + org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher + + /${project.basedir}/src/gen/generate.mwe2 + + compile + true + false + + + + + + org.eclipse.emf + org.eclipse.emf.mwe2.launch + 2.14.0 + + + org.eclipse.xtext + org.eclipse.xtext.xtext.generator + 2.30.0 + + + org.eclipse.xtext + org.eclipse.xtext.common.types + 2.30.0 + + + + + org.apache.felix + maven-bundle-plugin + + + + bundle + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + generate-sources + + add-source + + + + src/main/generated + + + + + + + org.apache.maven.plugins + maven-clean-plugin + + + default-clean + + + + ${project.basedir}/src/main/generated + + + ${project.basedir}/../org.emftext.language.java.edit/src/main/generated + + + ${project.basedir}/../org.emftext.language.java.edit/src/main/resources + + + + + + mwe2Clean + generate-sources + + clean + + + true + + + ${project.basedir} + + plugin.xml + plugin.properties + build.properties + + + + + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.codehaus.mojo + exec-maven-plugin + [1.6.0,) + + java + + + + + + + + + org.apache.maven.plugins + maven-clean-plugin + [3.1.0,) + + clean + + + + + + + + + + + + + + + + + org.eclipse.emf + org.eclipse.emf.ecore + + + diff --git a/bundles/org.emftext.language.java/schema/java_classpath_initializer.exsd b/bundles/org.emftext.language.java/schema/java_classpath_initializer.exsd deleted file mode 100644 index 2ad59bc7..00000000 --- a/bundles/org.emftext.language.java/schema/java_classpath_initializer.exsd +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - - - [Enter description of this extension point.] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [Enter the first release in which this extension point appears.] - - - - - - - - - [Enter extension point usage example here.] - - - - - - - - - [Enter API information here.] - - - - - - - - - [Enter information about supplied implementation of this extension point.] - - - - - diff --git a/bundles/org.emftext.language.java/src/gen/generate.mwe2 b/bundles/org.emftext.language.java/src/gen/generate.mwe2 new file mode 100644 index 00000000..1f2cef1c --- /dev/null +++ b/bundles/org.emftext.language.java/src/gen/generate.mwe2 @@ -0,0 +1,25 @@ +module generate + +import org.eclipse.emf.mwe2.ecore.EcoreGenerator +import org.eclipse.emf.mwe.utils.StandaloneSetup + +var workspaceRoot = "./bundles" + +Workflow { + + bean = StandaloneSetup { + logResourceUriMap = true + scanClassPath = false + platformUri = workspaceRoot + projectMapping = { + projectName = "org.emftext.language.java" + path = "bundles/org.emftext.language.java" + } + } + + component = EcoreGenerator { + genModel = "platform:/resource/org.emftext.language.java/src/main/resources/metamodel/java.genmodel" + srcPath = "platform:/resource/org.emftext.language.java/src/main/generated" + generateEdit = true + } +} diff --git a/bundles/org.emftext.language.java/src/jamopp/options/ParserOptions.java b/bundles/org.emftext.language.java/src/main/java/jamopp/options/ParserOptions.java similarity index 100% rename from bundles/org.emftext.language.java/src/jamopp/options/ParserOptions.java rename to bundles/org.emftext.language.java/src/main/java/jamopp/options/ParserOptions.java diff --git a/bundles/org.emftext.language.java/src/jamopp/options/ParserOptionsValueContainer.java b/bundles/org.emftext.language.java/src/main/java/jamopp/options/ParserOptionsValueContainer.java similarity index 100% rename from bundles/org.emftext.language.java/src/jamopp/options/ParserOptionsValueContainer.java rename to bundles/org.emftext.language.java/src/main/java/jamopp/options/ParserOptionsValueContainer.java diff --git a/bundles/org.emftext.language.java/src/jamopp/options/package-info.java b/bundles/org.emftext.language.java/src/main/java/jamopp/options/package-info.java similarity index 100% rename from bundles/org.emftext.language.java/src/jamopp/options/package-info.java rename to bundles/org.emftext.language.java/src/main/java/jamopp/options/package-info.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/JavaClasspath.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/JavaClasspath.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/JavaClasspath.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/JavaClasspath.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/JavaFactory.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/JavaFactory.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/JavaFactory.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/JavaFactory.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/JavaPackage.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/JavaPackage.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/JavaPackage.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/JavaPackage.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/LogicalJavaURIGenerator.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/LogicalJavaURIGenerator.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/LogicalJavaURIGenerator.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/LogicalJavaURIGenerator.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/arrays/ArrayTypeableExtension.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/arrays/ArrayTypeableExtension.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/arrays/ArrayTypeableExtension.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/arrays/ArrayTypeableExtension.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/arrays/package-info.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/arrays/package-info.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/arrays/package-info.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/arrays/package-info.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/classifiers/AnnotationExtension.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/classifiers/AnnotationExtension.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/classifiers/AnnotationExtension.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/classifiers/AnnotationExtension.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/classifiers/AnonymousClassExtension.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/classifiers/AnonymousClassExtension.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/classifiers/AnonymousClassExtension.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/classifiers/AnonymousClassExtension.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/classifiers/ClassExtension.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/classifiers/ClassExtension.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/classifiers/ClassExtension.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/classifiers/ClassExtension.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/classifiers/ClassifierExtension.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/classifiers/ClassifierExtension.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/classifiers/ClassifierExtension.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/classifiers/ClassifierExtension.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/classifiers/ConcreteClassifierExtension.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/classifiers/ConcreteClassifierExtension.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/classifiers/ConcreteClassifierExtension.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/classifiers/ConcreteClassifierExtension.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/classifiers/EnumerationExtension.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/classifiers/EnumerationExtension.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/classifiers/EnumerationExtension.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/classifiers/EnumerationExtension.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/classifiers/InterfaceExtension.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/classifiers/InterfaceExtension.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/classifiers/InterfaceExtension.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/classifiers/InterfaceExtension.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/classifiers/package-info.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/classifiers/package-info.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/classifiers/package-info.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/classifiers/package-info.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/commons/CommentableExtension.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/commons/CommentableExtension.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/commons/CommentableExtension.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/commons/CommentableExtension.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/commons/NamespaceAwareElementExtension.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/commons/NamespaceAwareElementExtension.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/commons/NamespaceAwareElementExtension.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/commons/NamespaceAwareElementExtension.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/commons/package-info.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/commons/package-info.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/commons/package-info.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/commons/package-info.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/containers/CompilationUnitExtension.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/containers/CompilationUnitExtension.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/containers/CompilationUnitExtension.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/containers/CompilationUnitExtension.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/containers/JavaRootExtension.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/containers/JavaRootExtension.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/containers/JavaRootExtension.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/containers/JavaRootExtension.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/containers/package-info.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/containers/package-info.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/containers/package-info.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/containers/package-info.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/expressions/CastExpressionExtension.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/expressions/CastExpressionExtension.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/expressions/CastExpressionExtension.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/expressions/CastExpressionExtension.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/expressions/ConditionalExpressionExtension.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/expressions/ConditionalExpressionExtension.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/expressions/ConditionalExpressionExtension.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/expressions/ConditionalExpressionExtension.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/expressions/ExpressionExtension.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/expressions/ExpressionExtension.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/expressions/ExpressionExtension.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/expressions/ExpressionExtension.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/expressions/LambdaExpressionExtension.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/expressions/LambdaExpressionExtension.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/expressions/LambdaExpressionExtension.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/expressions/LambdaExpressionExtension.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/expressions/MethodReferenceExpressionExtension.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/expressions/MethodReferenceExpressionExtension.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/expressions/MethodReferenceExpressionExtension.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/expressions/MethodReferenceExpressionExtension.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/expressions/package-info.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/expressions/package-info.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/expressions/package-info.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/expressions/package-info.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/generics/ExtendsTypeArgumentExtension.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/generics/ExtendsTypeArgumentExtension.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/generics/ExtendsTypeArgumentExtension.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/generics/ExtendsTypeArgumentExtension.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/generics/TypeParameterExtension.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/generics/TypeParameterExtension.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/generics/TypeParameterExtension.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/generics/TypeParameterExtension.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/generics/package-info.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/generics/package-info.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/generics/package-info.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/generics/package-info.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/imports/ImportExtension.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/imports/ImportExtension.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/imports/ImportExtension.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/imports/ImportExtension.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/imports/package-info.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/imports/package-info.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/imports/package-info.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/imports/package-info.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/literals/LiteralExtension.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/literals/LiteralExtension.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/literals/LiteralExtension.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/literals/LiteralExtension.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/literals/package-info.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/literals/package-info.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/literals/package-info.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/literals/package-info.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/members/ConstructorExtension.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/members/ConstructorExtension.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/members/ConstructorExtension.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/members/ConstructorExtension.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/members/MemberContainerExtension.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/members/MemberContainerExtension.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/members/MemberContainerExtension.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/members/MemberContainerExtension.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/members/MethodExtension.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/members/MethodExtension.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/members/MethodExtension.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/members/MethodExtension.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/members/package-info.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/members/package-info.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/members/package-info.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/members/package-info.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/modifiers/AnnotableAndModifiableExtension.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/modifiers/AnnotableAndModifiableExtension.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/modifiers/AnnotableAndModifiableExtension.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/modifiers/AnnotableAndModifiableExtension.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/modifiers/package-info.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/modifiers/package-info.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/modifiers/package-info.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/modifiers/package-info.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/references/ArgumentableExtension.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/references/ArgumentableExtension.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/references/ArgumentableExtension.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/references/ArgumentableExtension.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/references/ReferenceExtension.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/references/ReferenceExtension.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/references/ReferenceExtension.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/references/ReferenceExtension.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/references/package-info.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/references/package-info.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/references/package-info.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/references/package-info.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/statements/CatchBlockExtension.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/statements/CatchBlockExtension.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/statements/CatchBlockExtension.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/statements/CatchBlockExtension.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/statements/StatementListContainerExtension.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/statements/StatementListContainerExtension.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/statements/StatementListContainerExtension.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/statements/StatementListContainerExtension.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/statements/SynchronizedBlockExtension.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/statements/SynchronizedBlockExtension.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/statements/SynchronizedBlockExtension.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/statements/SynchronizedBlockExtension.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/statements/TryBlockExtension.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/statements/TryBlockExtension.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/statements/TryBlockExtension.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/statements/TryBlockExtension.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/statements/package-info.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/statements/package-info.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/statements/package-info.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/statements/package-info.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/types/InferableTypeExtension.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/types/InferableTypeExtension.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/types/InferableTypeExtension.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/types/InferableTypeExtension.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/types/PrimitiveTypeExtension.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/types/PrimitiveTypeExtension.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/types/PrimitiveTypeExtension.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/types/PrimitiveTypeExtension.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/types/TypeExtension.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/types/TypeExtension.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/types/TypeExtension.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/types/TypeExtension.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/types/TypeReferenceExtension.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/types/TypeReferenceExtension.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/types/TypeReferenceExtension.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/types/TypeReferenceExtension.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/types/package-info.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/types/package-info.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/types/package-info.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/types/package-info.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/variables/VariableExtension.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/variables/VariableExtension.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/variables/VariableExtension.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/variables/VariableExtension.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/variables/package-info.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/variables/package-info.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/extensions/variables/package-info.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/extensions/variables/package-info.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/impl/JavaFactoryImpl.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/impl/JavaFactoryImpl.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/impl/JavaFactoryImpl.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/impl/JavaFactoryImpl.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/impl/JavaPackageImpl.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/impl/JavaPackageImpl.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/impl/JavaPackageImpl.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/impl/JavaPackageImpl.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/impl/package-info.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/impl/package-info.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/impl/package-info.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/impl/package-info.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/package-info.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/package-info.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/package-info.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/package-info.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/util/TemporalCompositeClassifier.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/util/TemporalCompositeClassifier.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/util/TemporalCompositeClassifier.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/util/TemporalCompositeClassifier.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/util/TemporalCompositeTypeReference.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/util/TemporalCompositeTypeReference.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/util/TemporalCompositeTypeReference.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/util/TemporalCompositeTypeReference.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/util/TemporalFullNameHolder.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/util/TemporalFullNameHolder.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/util/TemporalFullNameHolder.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/util/TemporalFullNameHolder.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/util/TemporalTypeArgumentHolder.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/util/TemporalTypeArgumentHolder.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/util/TemporalTypeArgumentHolder.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/util/TemporalTypeArgumentHolder.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/util/TemporalUnknownLambdaExpressionType.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/util/TemporalUnknownLambdaExpressionType.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/util/TemporalUnknownLambdaExpressionType.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/util/TemporalUnknownLambdaExpressionType.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/util/TemporalUnknownType.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/util/TemporalUnknownType.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/util/TemporalUnknownType.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/util/TemporalUnknownType.java diff --git a/bundles/org.emftext.language.java/src/org/emftext/language/java/util/package-info.java b/bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/util/package-info.java similarity index 100% rename from bundles/org.emftext.language.java/src/org/emftext/language/java/util/package-info.java rename to bundles/org.emftext.language.java/src/main/java/org/emftext/language/java/util/package-info.java diff --git a/bundles/org.emftext.language.java/metamodel/java.ecore b/bundles/org.emftext.language.java/src/main/resources/metamodel/java.ecore similarity index 100% rename from bundles/org.emftext.language.java/metamodel/java.ecore rename to bundles/org.emftext.language.java/src/main/resources/metamodel/java.ecore diff --git a/bundles/org.emftext.language.java/metamodel/java.genmodel b/bundles/org.emftext.language.java/src/main/resources/metamodel/java.genmodel similarity index 99% rename from bundles/org.emftext.language.java/metamodel/java.genmodel rename to bundles/org.emftext.language.java/src/main/resources/metamodel/java.genmodel index 3b0a73bd..fc492464 100644 --- a/bundles/org.emftext.language.java/metamodel/java.genmodel +++ b/bundles/org.emftext.language.java/src/main/resources/metamodel/java.genmodel @@ -1,11 +1,11 @@ + complianceLevel="17.0" suppressGenModelAnnotations="false" copyrightFields="false"> java.ecore diff --git a/bundles/org.emftext.language.java/plugin.properties b/bundles/org.emftext.language.java/src/main/resources/plugin.properties similarity index 100% rename from bundles/org.emftext.language.java/plugin.properties rename to bundles/org.emftext.language.java/src/main/resources/plugin.properties diff --git a/bundles/org.emftext.language.java/plugin.xml b/bundles/org.emftext.language.java/src/main/resources/plugin.xml similarity index 97% rename from bundles/org.emftext.language.java/plugin.xml rename to bundles/org.emftext.language.java/src/main/resources/plugin.xml index 8ccfa4e9..85c50815 100644 --- a/bundles/org.emftext.language.java/plugin.xml +++ b/bundles/org.emftext.language.java/src/main/resources/plugin.xml @@ -19,8 +19,6 @@ --> - - + + + 4.0.0 + + jamopp.bundles + pom + JaMoPP Bundles + + + tools.mdsd + jamopp.parent + 6.0.0-SNAPSHOT + + + + jamopp.parser + jamopp.parser.bcel + jamopp.parser.jdt + jamopp.parser.jdt.singlefile + jamopp.printer + jamopp.resolution + jamopp.resource + jamopp.standalone + org.emftext.language.java + org.emftext.language.java.edit + + + diff --git a/features/org.emftext.language.java.feature/.project b/features/org.emftext.language.java.feature/.project deleted file mode 100644 index 8578e31c..00000000 --- a/features/org.emftext.language.java.feature/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - org.emftext.language.java.feature - - - - - - org.eclipse.pde.FeatureBuilder - - - - - - org.eclipse.pde.FeatureNature - - diff --git a/features/org.emftext.language.java.feature/build.properties b/features/org.emftext.language.java.feature/build.properties deleted file mode 100644 index 64f93a9f..00000000 --- a/features/org.emftext.language.java.feature/build.properties +++ /dev/null @@ -1 +0,0 @@ -bin.includes = feature.xml diff --git a/features/org.emftext.language.java.feature/feature.xml b/features/org.emftext.language.java.feature/feature.xml deleted file mode 100644 index 3b1f2563..00000000 --- a/features/org.emftext.language.java.feature/feature.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - - - JaMoPP: Java Model Parser and Printer (EMFText-based Java support for EMF modelling tools). - - - - Copyright (c) 2006-2013 Software Technology Group, Dresden University of Technology, Germany; DevBoost GmbH, Dresden, Amtsgericht Dresden, HRB 34001. - - - - Eclipse Public License v1.0 - -Copyright (c) 2006-2013 -Software Technology Group, Dresden University of Technology -DevBoost GmbH, Dresden, Amtsgericht Dresden, HRB 34001. - -All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html - -Contributors: - Software Technology Group - TU Dresden, Germany; - DevBoost GmbH - Dresden, Germany - - initial API and implementation - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/releng/org.palladiosimulator.jdt.updatesite/category.xml b/jamopp.p2/category.xml similarity index 100% rename from releng/org.palladiosimulator.jdt.updatesite/category.xml rename to jamopp.p2/category.xml diff --git a/jamopp.p2/pom.xml b/jamopp.p2/pom.xml new file mode 100644 index 00000000..7003887f --- /dev/null +++ b/jamopp.p2/pom.xml @@ -0,0 +1,145 @@ + + + tools.mdsd + jamopp.parent + 6.0.0-SNAPSHOT + + 4.0.0 + jamopp.p2 + JaMoPP P2 + pom + + + + org.reficio + p2-maven-plugin + 2.1.0 + + + package + + site + + + ${project.basedir}/category.xml + + + + + tools.mdsd:org.emftext.language.java:6.0.0-SNAPSHOT + tools.mdsd:org.emftext.language.java.edit:6.0.0-SNAPSHOT + tools.mdsd:jamopp.parser.jdt.singlefile:6.0.0-SNAPSHOT + tools.mdsd:jamopp.resource:6.0.0-SNAPSHOT + tools.mdsd:jamopp.parser.jdt:6.0.0-SNAPSHOT + tools.mdsd:jamopp.standalone:6.0.0-SNAPSHOT + + + + + org.emftext.language.java.feature + ${project.version} + + ${project.groupId} + JaMoPP: Java Model Parser and Printer (EMFText-based Java support for EMF modelling tools). + + Copyright (c) 2006-2013 Software Technology Group, Dresden University of Technology, Germany; DevBoost GmbH, Dresden, Amtsgericht Dresden, HRB 34001. + + +Eclipse Public License v1.0 + +Copyright (c) 2006-2013 +Software Technology Group, Dresden University of Technology +DevBoost GmbH, Dresden, Amtsgericht Dresden, HRB 34001. + +All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html + +Contributors: + Software Technology Group - TU Dresden, Germany; + DevBoost GmbH - Dresden, Germany + - initial API and implementation + + true + + + tools.mdsd:org.emftext.language.java:6.0.0-SNAPSHOT + false + false + + + tools.mdsd:org.emftext.language.java.edit:6.0.0-SNAPSHOT + false + false + + + tools.mdsd:jamopp.parser:6.0.0-SNAPSHOT + false + false + + + tools.mdsd:jamopp.parser.jdt:6.0.0-SNAPSHOT + false + false + + + tools.mdsd:jamopp.parser.jdt.singlefile:6.0.0-SNAPSHOT + false + false + + + tools.mdsd:jamopp.printer:6.0.0-SNAPSHOT + false + false + + + tools.mdsd:jamopp.resolution:6.0.0-SNAPSHOT + false + false + + + tools.mdsd:jamopp.resource:6.0.0-SNAPSHOT + false + false + + + tools.mdsd:jamopp.standalone:6.0.0-SNAPSHOT + false + false + + + + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + src/assembly/src.xml + + + + + package + + single + + + + + + + + + + tools.mdsd + org.emftext.language.java.edit + 6.0.0-SNAPSHOT + pom + + + diff --git a/jamopp.p2/src/assembly/src.xml b/jamopp.p2/src/assembly/src.xml new file mode 100644 index 00000000..940d94d3 --- /dev/null +++ b/jamopp.p2/src/assembly/src.xml @@ -0,0 +1,22 @@ + + p2-zipped + + zip + + false + + + ${project.build.directory}/repository + + + false + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 29e15d3e..a136fa97 100644 --- a/pom.xml +++ b/pom.xml @@ -5,40 +5,184 @@ 4.0.0 - - org.palladiosimulator - eclipse-parent-updatesite - 0.8.7 - - - org.palladiosimulator.jdt - parent - 5.1.0-SNAPSHOT + tools.mdsd + jamopp.parent + 6.0.0-SNAPSHOT pom + JaMoPP Parent - ${project.basedir}/releng/org.palladiosimulator.jdt.targetplatform/org.palladiosimulator.jdt.targetplatform.target + 17 + 17 UTF-8 + 2022-04-12T00:00:00Z - releng bundles - features tests - + jamopp.p2 + + + + org.eclipse.platform + org.eclipse.core.runtime + 3.26.100 + + + org.eclipse.platform + org.eclipse.core.resources + 3.18.0 + + + org.eclipse.emf + org.eclipse.emf.ecore + 2.33.0 + + + org.eclipse.emf + org.eclipse.emf.ecore.xmi + 2.18.0 + + + org.eclipse.emf + org.eclipse.emf.ecore.change + 2.15.0 + + + org.eclipse.emf + org.eclipse.emf.codegen.ecore + 2.33.0 + + + org.eclipse.emf + org.eclipse.emf.edit + 2.18.0 + + + org.eclipse.emf + org.eclipse.emf.mwe2.launch + 2.14.0 + + + org.eclipse.xtext + org.eclipse.xtext.xtext.generator + 2.27.0 + + + org.eclipse.xtext + org.eclipse.xtext.common.types + 2.27.0 + + + org.apache.bcel + bcel + 6.7.0 + + + org.eclipse.jdt + org.eclipse.jdt.core + 3.33.0 + + + org.junit.jupiter + junit-jupiter + 5.9.2 + + + org.junit.jupiter + junit-jupiter-engine + 5.9.2 + + + org.apache.logging.log4j + log4j-1.2-api + 2.20.0 + + + org.apache.logging.log4j + log4j-api + 2.20.0 + + + org.apache.logging.log4j + log4j-core + 2.20.0 + + + org.eclipse.platform + org.eclipse.ui + 3.202.0 + + + org.eclipse.platform + org.eclipse.e4.core.di + 1.8.300 + + + com.google.code.gson + gson + 2.10.1 + + + org.apache.commons + commons-compress + 1.23.0 + + + + - - - org.apache.maven.plugins - maven-checkstyle-plugin - - unicode/**/*,bugs/**/*,locations/**/*,mbtp/**/*,pkg/**/*,pkg2/**/*,refs/**/*,resolving/**/*,resolving_new/**/*,spechier/**/*,staticcalltarget/**/* - - - + + + + org.apache.maven.plugins + maven-clean-plugin + 3.2.0 + + + org.apache.maven.plugins + maven-sources-plugin + 3.2.1 + + + org.apache.maven.plugins + maven-resources-plugin + 3.3.1 + + + org.apache.maven.plugins + maven-jar-plugin + 3.3.0 + + + org.apache.maven.plugins + maven-assembly-plugin + 3.5.0 + + + org.codehaus.mojo + exec-maven-plugin + 3.1.0 + + + org.codehaus.mojo + build-helper-maven-plugin + 3.3.0 + + + org.apache.felix + maven-bundle-plugin + 5.1.8 + + + org.apache.maven.plugins + maven-surefire-plugin + 3.1.0 + + + - diff --git a/releng/org.palladiosimulator.jdt.targetplatform/.project b/releng/org.palladiosimulator.jdt.targetplatform/.project deleted file mode 100644 index 52878501..00000000 --- a/releng/org.palladiosimulator.jdt.targetplatform/.project +++ /dev/null @@ -1,11 +0,0 @@ - - - org.palladiosimulator.jdt.targetplatform - - - - - - - - diff --git a/releng/org.palladiosimulator.jdt.targetplatform/org.palladiosimulator.jdt.targetplatform.target b/releng/org.palladiosimulator.jdt.targetplatform/org.palladiosimulator.jdt.targetplatform.target deleted file mode 100644 index 7591c3a2..00000000 --- a/releng/org.palladiosimulator.jdt.targetplatform/org.palladiosimulator.jdt.targetplatform.target +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/releng/org.palladiosimulator.jdt.updatesite/.project b/releng/org.palladiosimulator.jdt.updatesite/.project deleted file mode 100644 index 4e9eef1f..00000000 --- a/releng/org.palladiosimulator.jdt.updatesite/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - org.palladiosimulator.jdt.updatesite - - - - - - org.eclipse.pde.UpdateSiteBuilder - - - - - - org.eclipse.pde.UpdateSiteNature - - diff --git a/releng/org.palladiosimulator.jdt.workflow/.classpath b/releng/org.palladiosimulator.jdt.workflow/.classpath deleted file mode 100644 index e3f34343..00000000 --- a/releng/org.palladiosimulator.jdt.workflow/.classpath +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/releng/org.palladiosimulator.jdt.workflow/.project b/releng/org.palladiosimulator.jdt.workflow/.project deleted file mode 100644 index 878c3f39..00000000 --- a/releng/org.palladiosimulator.jdt.workflow/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - org.palladiosimulator.jdt.workflow - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - org.eclipse.xtext.ui.shared.xtextBuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.pde.PluginNature - org.eclipse.xtext.ui.shared.xtextNature - - diff --git a/releng/org.palladiosimulator.jdt.workflow/META-INF/MANIFEST.MF b/releng/org.palladiosimulator.jdt.workflow/META-INF/MANIFEST.MF deleted file mode 100644 index b3edec94..00000000 --- a/releng/org.palladiosimulator.jdt.workflow/META-INF/MANIFEST.MF +++ /dev/null @@ -1,16 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: MWE2 Workflows for Code Generation -Bundle-SymbolicName: org.palladiosimulator.jdt.workflow;singleton:=true -Bundle-Version: 5.1.0.qualifier -Bundle-ClassPath: . -Bundle-Vendor: Martin Armbruster -Bundle-RequiredExecutionEnvironment: JavaSE-17 -Automatic-Module-Name: org.palladiosimulator.jdt.workflow -Require-Bundle: org.eclipse.emf.ecore, - org.eclipse.emf.mwe2.lib, - org.eclipse.emf.mwe2.launch, - org.apache.log4j, - org.eclipse.core.runtime, - org.apache.commons.logging -Bundle-ActivationPolicy: lazy diff --git a/releng/org.palladiosimulator.jdt.workflow/build.properties b/releng/org.palladiosimulator.jdt.workflow/build.properties deleted file mode 100644 index db01757c..00000000 --- a/releng/org.palladiosimulator.jdt.workflow/build.properties +++ /dev/null @@ -1,4 +0,0 @@ -bin.includes = .,\ - META-INF/,\ - build.properties -jars.compile.order = . \ No newline at end of file diff --git a/releng/org.palladiosimulator.jdt.workflow/workflow/clean.mwe2 b/releng/org.palladiosimulator.jdt.workflow/workflow/clean.mwe2 deleted file mode 100644 index 50cef1ff..00000000 --- a/releng/org.palladiosimulator.jdt.workflow/workflow/clean.mwe2 +++ /dev/null @@ -1,25 +0,0 @@ -module clean - -import org.eclipse.emf.mwe.utils.DirectoryCleaner - -Workflow { - component = DirectoryCleaner { - directory = "../../bundles/org.emftext.language.java/src-gen" - } - - component = DirectoryCleaner { - directory = "../../bundles/org.emftext.language.java.edit/src-gen" - } - - component = DirectoryCleaner { - directory = "../../bundles/org.emftext.language.java.edit/icons" - } - - component = DirectoryCleaner { - directory = "../../bundles/org.emftext.language.java.editor/src-gen" - } - - component = DirectoryCleaner { - directory = "../../bundles/org.emftext.language.java.editor/icons" - } -} diff --git a/releng/org.palladiosimulator.jdt.workflow/workflow/generate.mwe2 b/releng/org.palladiosimulator.jdt.workflow/workflow/generate.mwe2 deleted file mode 100644 index 6eaa5315..00000000 --- a/releng/org.palladiosimulator.jdt.workflow/workflow/generate.mwe2 +++ /dev/null @@ -1,23 +0,0 @@ -module generate - -import org.eclipse.emf.mwe2.ecore.EcoreGenerator -import org.eclipse.emf.mwe.utils.StandaloneSetup - -var workspaceRoot = "../../bundles" - -Workflow { - - bean = StandaloneSetup { - scanClassPath = true - platformUri = workspaceRoot - - logResourceUriMap = true - } - - component = EcoreGenerator { - genModel = "platform:/resource/org.emftext.language.java/metamodel/java.genmodel" - srcPath = "platform:/resource/org.emftext.language.java/src-gen" - generateEdit = true - generateEditor = true - } -} diff --git a/tests/org.emftext.language.java.test/.checkstyle b/tests/org.emftext.language.java.test/.checkstyle deleted file mode 100644 index 11cbfa40..00000000 --- a/tests/org.emftext.language.java.test/.checkstyle +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/tests/org.emftext.language.java.test/.classpath b/tests/org.emftext.language.java.test/.classpath deleted file mode 100644 index b8e096c7..00000000 --- a/tests/org.emftext.language.java.test/.classpath +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/tests/org.emftext.language.java.test/.gitignore b/tests/org.emftext.language.java.test/.gitignore deleted file mode 100644 index 2ce6ae05..00000000 --- a/tests/org.emftext.language.java.test/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -output -standalone_output* -output_performance \ No newline at end of file diff --git a/tests/org.emftext.language.java.test/.project b/tests/org.emftext.language.java.test/.project deleted file mode 100644 index c5a21df4..00000000 --- a/tests/org.emftext.language.java.test/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - org.emftext.language.java.test - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - net.sf.eclipsecs.core.CheckstyleBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - net.sf.eclipsecs.core.CheckstyleNature - - diff --git a/tests/org.emftext.language.java.test/META-INF/MANIFEST.MF b/tests/org.emftext.language.java.test/META-INF/MANIFEST.MF deleted file mode 100644 index 2f7eb2ec..00000000 --- a/tests/org.emftext.language.java.test/META-INF/MANIFEST.MF +++ /dev/null @@ -1,31 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: JaMoPP Test Plugin -Bundle-SymbolicName: org.emftext.language.java.test -Bundle-Version: 5.1.0.qualifier -Bundle-Vendor: Martin Armbruster -Bundle-RequiredExecutionEnvironment: JavaSE-17 -Bundle-ActivationPolicy: lazy -Bundle-Activator: org.emftext.language.java.test.JaMoPPTestPlugin -Automatic-Module-Name: org.emftext.language.java.test -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.jdt.core, - org.eclipse.text, - org.emftext.language.java, - org.eclipse.emf.ecore.xmi, - org.eclipse.core.resources, - org.eclipse.jface.text, - jamopp.resource, - org.apache.commons.compress, - jamopp.parser.jdt.singlefile, - org.apache.log4j, - jamopp.parser, - com.google.gson, - jamopp.resolution, - jamopp.parser.jdt -Export-Package: org.emftext.language.java.test -Import-Package: org.junit, - org.junit.jupiter.api, - org.junit.jupiter.params, - org.junit.jupiter.params.provider, - org.junit.platform.commons.annotation diff --git a/tests/org.emftext.language.java.test/build.properties b/tests/org.emftext.language.java.test/build.properties deleted file mode 100644 index 7658d8b9..00000000 --- a/tests/org.emftext.language.java.test/build.properties +++ /dev/null @@ -1,5 +0,0 @@ -source.. = src/,\ - src-input/ -output.. = bin/ -bin.includes = META-INF/,\ - . diff --git a/tests/org.emftext.language.java.test/pom.xml b/tests/org.emftext.language.java.test/pom.xml new file mode 100644 index 00000000..a42f2c48 --- /dev/null +++ b/tests/org.emftext.language.java.test/pom.xml @@ -0,0 +1,117 @@ + + + + 4.0.0 + org.emftext.language.java.test + jar + JaMoPP Test Plugin + + + tools.mdsd + jamopp.tests + 6.0.0-SNAPSHOT + + + + + + org.apache.felix + maven-bundle-plugin + + + + bundle + + + + + + org.apache.maven.plugins + maven-clean-plugin + + + default-clean + + true + + + ${project.build.directory} + + src-bulk/**/* + + + + + + + + + + + + + org.eclipse.emf + org.eclipse.emf.ecore + + + tools.mdsd + org.emftext.language.java + 6.0.0-SNAPSHOT + + + tools.mdsd + jamopp.parser + 6.0.0-SNAPSHOT + + + tools.mdsd + jamopp.parser.jdt + 6.0.0-SNAPSHOT + + + tools.mdsd + jamopp.parser.jdt.singlefile + 6.0.0-SNAPSHOT + + + tools.mdsd + jamopp.resolution + 6.0.0-SNAPSHOT + + + tools.mdsd + jamopp.resource + 6.0.0-SNAPSHOT + + + org.apache.logging.log4j + log4j-1.2-api + + + org.apache.logging.log4j + log4j-api + + + org.apache.logging.log4j + log4j-core + + + org.junit.jupiter + junit-jupiter + + + org.junit.jupiter + junit-jupiter-engine + + + com.google.code.gson + gson + + + org.apache.commons + commons-compress + + + diff --git a/tests/org.emftext.language.java.test/src/jamopp/test/recovery/TrivialRecoveryTest.java b/tests/org.emftext.language.java.test/src/test/java/jamopp/test/recovery/TrivialRecoveryTest.java similarity index 95% rename from tests/org.emftext.language.java.test/src/jamopp/test/recovery/TrivialRecoveryTest.java rename to tests/org.emftext.language.java.test/src/test/java/jamopp/test/recovery/TrivialRecoveryTest.java index f0d8d430..4a5c7108 100644 --- a/tests/org.emftext.language.java.test/src/jamopp/test/recovery/TrivialRecoveryTest.java +++ b/tests/org.emftext.language.java.test/src/test/java/jamopp/test/recovery/TrivialRecoveryTest.java @@ -34,7 +34,7 @@ public void testRecovery() throws Exception { ParserOptions.RESOLVE_EVERYTHING.setValue(Boolean.FALSE); JaMoPPJDTSingleFileParser parser = new JaMoPPJDTSingleFileParser(); parser.setExclusionPatterns(".*?/src/test/.*?", ".*?/src/client/.*?", ".*?/src/e2e/.*?", ".*?/src/lnp/.*?", ".*?/src/web/.*?"); - var set = parser.parseDirectory(Paths.get("teammates")); + var set = parser.parseDirectory(Paths.get("target", "src-bulk", "teammates")); new TrivialRecovery(set).recover(); set.getResources().forEach(resource -> this.assertResolveAllProxies(resource)); super.testReprint(set); diff --git a/tests/org.emftext.language.java.test/src/jamopp/test/recovery/package-info.java b/tests/org.emftext.language.java.test/src/test/java/jamopp/test/recovery/package-info.java similarity index 100% rename from tests/org.emftext.language.java.test/src/jamopp/test/recovery/package-info.java rename to tests/org.emftext.language.java.test/src/test/java/jamopp/test/recovery/package-info.java diff --git a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/AbstractJaMoPPTests.java b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/AbstractJaMoPPTests.java similarity index 98% rename from tests/org.emftext.language.java.test/src/org/emftext/language/java/test/AbstractJaMoPPTests.java rename to tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/AbstractJaMoPPTests.java index 54a50df8..fd51cd4f 100644 --- a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/AbstractJaMoPPTests.java +++ b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/AbstractJaMoPPTests.java @@ -57,6 +57,7 @@ import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; import org.eclipse.emf.ecore.util.Diagnostician; import org.eclipse.emf.ecore.util.EcoreUtil; +import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.dom.AST; import org.eclipse.jdt.core.dom.ASTParser; @@ -92,7 +93,7 @@ */ public abstract class AbstractJaMoPPTests { - protected static final String TEST_OUTPUT_FOLDER = "output"; + protected static final String TEST_OUTPUT_FOLDER = "target" + File.separator + "tests" + File.separator + "output"; @BeforeAll public static void initLogging() { @@ -108,6 +109,7 @@ public static void initLogging() { public final void initResourceFactory() { this.createNewResourceSet(); Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("java", new JavaResource2Factory()); + Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put(Resource.Factory.Registry.DEFAULT_EXTENSION, new XMIResourceFactoryImpl()); JavaClasspath.get().clear(); JavaClasspath.get().registerStdLib(); } diff --git a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/CharacterEscaper.java b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/CharacterEscaper.java similarity index 100% rename from tests/org.emftext.language.java.test/src/org/emftext/language/java/test/CharacterEscaper.java rename to tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/CharacterEscaper.java diff --git a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/ClassFileParserTest.java b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/ClassFileParserTest.java similarity index 97% rename from tests/org.emftext.language.java.test/src/org/emftext/language/java/test/ClassFileParserTest.java rename to tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/ClassFileParserTest.java index 856841aa..0e70d521 100644 --- a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/ClassFileParserTest.java +++ b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/ClassFileParserTest.java @@ -121,6 +121,6 @@ protected boolean isExcludedFromReprintTest(String filename) { @Override protected String getTestInputFolder() { - return "src-input"; + return "src" + File.separator + "test" + File.separator + "resources" + File.separator + "input"; } } diff --git a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/JaMoPPJDTParserDirectoryTest.java b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/JaMoPPJDTParserDirectoryTest.java similarity index 91% rename from tests/org.emftext.language.java.test/src/org/emftext/language/java/test/JaMoPPJDTParserDirectoryTest.java rename to tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/JaMoPPJDTParserDirectoryTest.java index e353ab9a..50c7eb48 100644 --- a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/JaMoPPJDTParserDirectoryTest.java +++ b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/JaMoPPJDTParserDirectoryTest.java @@ -50,7 +50,7 @@ public void setUp() { @Test public void testSrcInputDirectory() throws Exception { - ResourceSet set = parser.parseDirectory(Paths.get("src-input")); + ResourceSet set = parser.parseDirectory(Paths.get("src", "test", "resources", "input")); this.assertModelValid(set); this.testReprint(set); } @@ -58,7 +58,7 @@ public void testSrcInputDirectory() throws Exception { @Test @Disabled("JDT puts break statements into Blocks on the right side of a SwitchRule.") public void testSrcSevenAndUp() throws Exception { - ResourceSet set = parser.parseDirectory(Paths.get("src-sevenandup")); + ResourceSet set = parser.parseDirectory(Paths.get("src", "test", "resources", "sevenandup")); this.assertModelValid(set); this.testReprint(set); } diff --git a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/JaMoPPParserAPITest.java b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/JaMoPPParserAPITest.java similarity index 81% rename from tests/org.emftext.language.java.test/src/org/emftext/language/java/test/JaMoPPParserAPITest.java rename to tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/JaMoPPParserAPITest.java index 0b8fdf0f..d2c2382d 100644 --- a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/JaMoPPParserAPITest.java +++ b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/JaMoPPParserAPITest.java @@ -2,6 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; +import java.io.File; import java.nio.file.Paths; import org.eclipse.emf.ecore.resource.ResourceSet; @@ -25,7 +26,7 @@ public class JaMoPPParserAPITest extends AbstractJaMoPPTests { private JaMoPPJDTParser parser; private static final String JAVA_FILE_EXTENSION = ".java"; - protected static final String TEST_INPUT_FOLDER = "src-input"; + protected static final String TEST_INPUT_FOLDER = "src" + File.separator + "test" + File.separator + "resources" + File.separator + "input"; @BeforeEach public void setUp() { @@ -60,8 +61,8 @@ void testNameOfClass() { @Disabled public void testMethodOverwriting()throws Exception { //System.out.print("setup"); - String filenameParent = "scr-input/ClassB" + JAVA_FILE_EXTENSION; - String filenameChild = "scr-input/ClassA" + JAVA_FILE_EXTENSION; + String filenameParent = "src" + File.separator + "test" + File.separator + "resources" + File.separator + "input" + File.separator + "ClassB" + JAVA_FILE_EXTENSION; + String filenameChild = "src" + File.separator + "test" + File.separator + "resources" + File.separator + "input" + File.separator + "ClassA" + JAVA_FILE_EXTENSION; CompilationUnit cu = (CompilationUnit) parseResource(filenameParent, filenameChild); System.out.print("setup"); System.out.print(cu.getClassifiers().get(1).getName()); @@ -91,7 +92,7 @@ public void testMethodOverwriting()throws Exception { @Disabled public void testSrcSevenAndUp() { - ResourceSet set = parser.parseDirectory(Paths.get("src-sevenandup")); + ResourceSet set = parser.parseDirectory(Paths.get("src" + File.separator + "test" + File.separator + "resources" + File.separator + "sevenandup")); this.assertModelValid(set); } diff --git a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/JaMoPPTestPlugin.java b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/JaMoPPTestPlugin.java similarity index 100% rename from tests/org.emftext.language.java.test/src/org/emftext/language/java/test/JaMoPPTestPlugin.java rename to tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/JaMoPPTestPlugin.java diff --git a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/JavaSevenAndUpTest.java b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/JavaSevenAndUpTest.java similarity index 99% rename from tests/org.emftext.language.java.test/src/org/emftext/language/java/test/JavaSevenAndUpTest.java rename to tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/JavaSevenAndUpTest.java index 618c514b..0478cc98 100644 --- a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/JavaSevenAndUpTest.java +++ b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/JavaSevenAndUpTest.java @@ -74,7 +74,7 @@ public class JavaSevenAndUpTest extends AbstractJaMoPPTests { @Override public String getTestInputFolder() { - return "src-sevenandup"; + return "src" + File.separator + "test" + File.separator + "resources" + File.separator + "sevenandup"; } @Override diff --git a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/JavaSevenAndUpTestWithoutReprinting.java b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/JavaSevenAndUpTestWithoutReprinting.java similarity index 100% rename from tests/org.emftext.language.java.test/src/org/emftext/language/java/test/JavaSevenAndUpTestWithoutReprinting.java rename to tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/JavaSevenAndUpTestWithoutReprinting.java diff --git a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/OldJaMoPPParserTests.java b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/OldJaMoPPParserTests.java similarity index 98% rename from tests/org.emftext.language.java.test/src/org/emftext/language/java/test/OldJaMoPPParserTests.java rename to tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/OldJaMoPPParserTests.java index e9b2e31d..2d2e14d9 100644 --- a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/OldJaMoPPParserTests.java +++ b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/OldJaMoPPParserTests.java @@ -79,7 +79,7 @@ import org.junit.jupiter.api.Test; import jamopp.options.ParserOptions; -import pkg.NumberLiterals; +//import pkg.NumberLiterals; /** * JUnit test suite to test the JaMoPP parser. New tests should by added by: @@ -97,7 +97,7 @@ public class OldJaMoPPParserTests extends AbstractJaMoPPTests { private static final String JAVA_FILE_EXTENSION = ".java"; - protected static final String TEST_INPUT_FOLDER = "src-input"; + protected static final String TEST_INPUT_FOLDER = "src" + File.separator + "test" + File.separator + "resources" + File.separator + "input"; @Override protected Map getLoadOptions() { @@ -1450,6 +1450,7 @@ public void testNoTypeArgument() throws Exception { parseAndReprint(filename); } + @Disabled("TODO: Revisit to check how the code commented out can be replaced to avoid inclusion of test source code.") @Test public void testNumberLiterals() throws Exception { String typename = "NumberLiterals"; @@ -1459,18 +1460,18 @@ public void testNumberLiterals() throws Exception { // iterate over all fields, get their value using reflection and // compare this value with the one from the Java parser - java.lang.reflect.Field[] fields = NumberLiterals.class.getDeclaredFields(); - for (java.lang.reflect.Field field : fields) { - Object value = field.get(null); - Object bigValue = value; - if (value instanceof Integer) { - bigValue = BigInteger.valueOf(((Integer) value).longValue()); - } - if (value instanceof Long) { - bigValue = BigInteger.valueOf(((Long) value).longValue()); - } - assertIsNumericField(clazz.getMembers(), field.getName(), bigValue); - } +// java.lang.reflect.Field[] fields = NumberLiterals.class.getDeclaredFields(); +// for (java.lang.reflect.Field field : fields) { +// Object value = field.get(null); +// Object bigValue = value; +// if (value instanceof Integer) { +// bigValue = BigInteger.valueOf(((Integer) value).longValue()); +// } +// if (value instanceof Long) { +// bigValue = BigInteger.valueOf(((Long) value).longValue()); +// } +// assertIsNumericField(clazz.getMembers(), field.getName(), bigValue); +// } parseAndReprint(file); } diff --git a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/OldJaMoPPParserTestsWithoutReprinting.java b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/OldJaMoPPParserTestsWithoutReprinting.java similarity index 100% rename from tests/org.emftext.language.java.test/src/org/emftext/language/java/test/OldJaMoPPParserTestsWithoutReprinting.java rename to tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/OldJaMoPPParserTestsWithoutReprinting.java diff --git a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/TalkativeASTMatcher.java b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/TalkativeASTMatcher.java similarity index 100% rename from tests/org.emftext.language.java.test/src/org/emftext/language/java/test/TalkativeASTMatcher.java rename to tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/TalkativeASTMatcher.java diff --git a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/UnicodeTest.java b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/UnicodeTest.java similarity index 94% rename from tests/org.emftext.language.java.test/src/org/emftext/language/java/test/UnicodeTest.java rename to tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/UnicodeTest.java index bff5d117..99a27554 100644 --- a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/UnicodeTest.java +++ b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/UnicodeTest.java @@ -76,7 +76,7 @@ protected boolean isExcludedFromReprintTest(String filename) { @Override protected String getTestInputFolder() { - return "src-input" + File.separator + "unicode"; + return "src" + File.separator + "test" + File.separator + "resources" + File.separator + "input" + File.separator + "unicode"; } } diff --git a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/bugs/AbstractBugTestCase.java b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/bugs/AbstractBugTestCase.java similarity index 91% rename from tests/org.emftext.language.java.test/src/org/emftext/language/java/test/bugs/AbstractBugTestCase.java rename to tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/bugs/AbstractBugTestCase.java index 166bb211..589b5f57 100644 --- a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/bugs/AbstractBugTestCase.java +++ b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/bugs/AbstractBugTestCase.java @@ -16,6 +16,8 @@ package org.emftext.language.java.test.bugs; +import java.io.File; + import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; import org.emftext.language.java.test.AbstractJaMoPPTests; @@ -28,7 +30,7 @@ protected boolean isExcludedFromReprintTest(String fileName) { @Override protected String getTestInputFolder() { - return "src-input"; + return "src" + File.separator + "test" + File.separator + "resources" + File.separator + "input"; } protected ResourceSet createResourceSet() { diff --git a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/bugs/Bug1541Test.java b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/bugs/Bug1541Test.java similarity index 100% rename from tests/org.emftext.language.java.test/src/org/emftext/language/java/test/bugs/Bug1541Test.java rename to tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/bugs/Bug1541Test.java diff --git a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/bugs/Bug1818Test.java b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/bugs/Bug1818Test.java similarity index 100% rename from tests/org.emftext.language.java.test/src/org/emftext/language/java/test/bugs/Bug1818Test.java rename to tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/bugs/Bug1818Test.java diff --git a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/bugs/Bug1819Test.java b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/bugs/Bug1819Test.java similarity index 100% rename from tests/org.emftext.language.java.test/src/org/emftext/language/java/test/bugs/Bug1819Test.java rename to tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/bugs/Bug1819Test.java diff --git a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/bugs/Bug1834Test.java b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/bugs/Bug1834Test.java similarity index 100% rename from tests/org.emftext.language.java.test/src/org/emftext/language/java/test/bugs/Bug1834Test.java rename to tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/bugs/Bug1834Test.java diff --git a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/bugs/package-info.java b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/bugs/package-info.java similarity index 100% rename from tests/org.emftext.language.java.test/src/org/emftext/language/java/test/bugs/package-info.java rename to tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/bugs/package-info.java diff --git a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/bulk/BulkTest.java b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/bulk/BulkTest.java similarity index 99% rename from tests/org.emftext.language.java.test/src/org/emftext/language/java/test/bulk/BulkTest.java rename to tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/bulk/BulkTest.java index e4588d36..802e45c0 100644 --- a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/bulk/BulkTest.java +++ b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/bulk/BulkTest.java @@ -36,6 +36,7 @@ @Disabled("Requires initialization of all submodules and dependency resolution.") public class BulkTest extends AbstractJaMoPPTests { + // TODO: Adjust path. private final static String BASE_ZIP = "JaMoPP-BulkTest" + File.separator + "Tests" + File.separator + "org.emftext.language.java.test.bulk" + File.separator + "input" + File.separator; private final static String END_ZIP = File.separator + "src.zip"; diff --git a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/bulk/SingleFileParserBulkTests.java b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/bulk/SingleFileParserBulkTests.java similarity index 99% rename from tests/org.emftext.language.java.test/src/org/emftext/language/java/test/bulk/SingleFileParserBulkTests.java rename to tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/bulk/SingleFileParserBulkTests.java index 5b1266ae..5eb27ac7 100644 --- a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/bulk/SingleFileParserBulkTests.java +++ b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/bulk/SingleFileParserBulkTests.java @@ -45,6 +45,7 @@ public class SingleFileParserBulkTests extends AbstractJaMoPPTests { private static final Logger LOGGER = Logger.getLogger("jamopp." + SingleFileParserBulkTests.class.getSimpleName()); + // TODO: Adjust path. private static final String BASE_ZIP = "JaMoPP-BulkTest" + File.separator + "Tests" + File.separator + "org.emftext.language.java.test.bulk" + File.separator + "input" + File.separator; private static final String END_ZIP = File.separator + "src.zip"; diff --git a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/bulk/package-info.java b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/bulk/package-info.java similarity index 100% rename from tests/org.emftext.language.java.test/src/org/emftext/language/java/test/bulk/package-info.java rename to tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/bulk/package-info.java diff --git a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/package-info.java b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/package-info.java similarity index 100% rename from tests/org.emftext.language.java.test/src/org/emftext/language/java/test/package-info.java rename to tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/package-info.java diff --git a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/performance/PerformanceData.java b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/performance/PerformanceData.java similarity index 100% rename from tests/org.emftext.language.java.test/src/org/emftext/language/java/test/performance/PerformanceData.java rename to tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/performance/PerformanceData.java diff --git a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/performance/PerformanceDataPoint.java b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/performance/PerformanceDataPoint.java similarity index 100% rename from tests/org.emftext.language.java.test/src/org/emftext/language/java/test/performance/PerformanceDataPoint.java rename to tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/performance/PerformanceDataPoint.java diff --git a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/performance/PerformanceTest.java b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/performance/PerformanceTest.java similarity index 98% rename from tests/org.emftext.language.java.test/src/org/emftext/language/java/test/performance/PerformanceTest.java rename to tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/performance/PerformanceTest.java index 8e122957..a179c6e1 100644 --- a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/performance/PerformanceTest.java +++ b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/performance/PerformanceTest.java @@ -15,6 +15,7 @@ import static org.junit.jupiter.api.Assertions.fail; +import java.io.File; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -41,7 +42,7 @@ public class PerformanceTest extends AbstractJaMoPPTests { private static final Logger LOGGER = Logger.getLogger("jamopp." + SingleFileParserBulkTests.class.getSimpleName()); - private final String inputFolder = "TeaStore"; + private final String inputFolder = "target" + File.separator + "src-bulk" + File.separator + "TeaStore"; private final Path parentOutput = Paths.get("output_performance"); @Test diff --git a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/performance/package-info.java b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/performance/package-info.java similarity index 100% rename from tests/org.emftext.language.java.test/src/org/emftext/language/java/test/performance/package-info.java rename to tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/performance/package-info.java diff --git a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/resolving/AbstractResolverTestCase.java b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/resolving/AbstractResolverTestCase.java similarity index 96% rename from tests/org.emftext.language.java.test/src/org/emftext/language/java/test/resolving/AbstractResolverTestCase.java rename to tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/resolving/AbstractResolverTestCase.java index d731ab5f..0e210759 100644 --- a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/resolving/AbstractResolverTestCase.java +++ b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/resolving/AbstractResolverTestCase.java @@ -40,7 +40,7 @@ */ public abstract class AbstractResolverTestCase extends AbstractJaMoPPTests { - protected static final String TEST_INPUT_FOLDER_RESOLVING = "src-input" + File.separator + "resolving" + File.separator; + protected static final String TEST_INPUT_FOLDER_RESOLVING = "src" + File.separator + "test" + File.separator + "resources" + File.separator + "input" + File.separator + "resolving" + File.separator; protected Field assertIsField(Member member, String expectedName) { assertType(member, Field.class); diff --git a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/resolving/ImportResolverTest.java b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/resolving/ImportResolverTest.java similarity index 100% rename from tests/org.emftext.language.java.test/src/org/emftext/language/java/test/resolving/ImportResolverTest.java rename to tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/resolving/ImportResolverTest.java diff --git a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/resolving/MethodCallResolverTest.java b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/resolving/MethodCallResolverTest.java similarity index 100% rename from tests/org.emftext.language.java.test/src/org/emftext/language/java/test/resolving/MethodCallResolverTest.java rename to tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/resolving/MethodCallResolverTest.java diff --git a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/resolving/MethodCallWithoutInheritanceResolverTest.java b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/resolving/MethodCallWithoutInheritanceResolverTest.java similarity index 100% rename from tests/org.emftext.language.java.test/src/org/emftext/language/java/test/resolving/MethodCallWithoutInheritanceResolverTest.java rename to tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/resolving/MethodCallWithoutInheritanceResolverTest.java diff --git a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/resolving/MethodCallsWithLocalTypeReferencesResolverTest.java b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/resolving/MethodCallsWithLocalTypeReferencesResolverTest.java similarity index 100% rename from tests/org.emftext.language.java.test/src/org/emftext/language/java/test/resolving/MethodCallsWithLocalTypeReferencesResolverTest.java rename to tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/resolving/MethodCallsWithLocalTypeReferencesResolverTest.java diff --git a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/resolving/ReferenceToInheritedMethodTest.java b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/resolving/ReferenceToInheritedMethodTest.java similarity index 100% rename from tests/org.emftext.language.java.test/src/org/emftext/language/java/test/resolving/ReferenceToInheritedMethodTest.java rename to tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/resolving/ReferenceToInheritedMethodTest.java diff --git a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/resolving/VariableReferenceResolverTest.java b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/resolving/VariableReferenceResolverTest.java similarity index 100% rename from tests/org.emftext.language.java.test/src/org/emftext/language/java/test/resolving/VariableReferenceResolverTest.java rename to tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/resolving/VariableReferenceResolverTest.java diff --git a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/resolving/package-info.java b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/resolving/package-info.java similarity index 100% rename from tests/org.emftext.language.java.test/src/org/emftext/language/java/test/resolving/package-info.java rename to tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/resolving/package-info.java diff --git a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/standalone/StandaloneTest.java b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/standalone/StandaloneTest.java similarity index 90% rename from tests/org.emftext.language.java.test/src/org/emftext/language/java/test/standalone/StandaloneTest.java rename to tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/standalone/StandaloneTest.java index 9b2a6d69..4b7e5ca2 100644 --- a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/standalone/StandaloneTest.java +++ b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/standalone/StandaloneTest.java @@ -72,8 +72,10 @@ public class StandaloneTest extends JavaXMISerializationTest { * @see org.emftext.language.java.test.AbstractJaMoPPTests */ @ParameterizedTest - @ValueSource(strings = { "src-standalone", "acmeair", "piggymetrics", "petclinic", "TeaStore", "src-sevenandup", - "teammates", "esda", "microservice", "src-input" }) + // TODO: look for possibility to extract constants. + @ValueSource(strings = { "src/test/resources/standalone", "target/src-bulk/acmeair", "target/src-bulk/piggymetrics", + "target/src-bulk/petclinic", "target/src-bulk/TeaStore", "src/test/resources/sevenandup", + "target/src-bulk/teammates", "target/src-bulk/esda", "target/src-bulk/microservice", "src/test/resources/input" }) // src-input will be further examined, because it includes special symbols. One // of them is allowed in java but not allowed in xml. public void testProject(String input) throws Exception { @@ -88,7 +90,7 @@ public void testProject(String input) throws Exception { parser.setExclusionPatterns(".*?/src/test/.*?", ".*?UnicodeIdentifiers.java"); final ResourceSet rs = parser.parseDirectory(directory); - TEST_OUTPUT_FOLDER_NAME = "standalone_output_ResolveAll_Active" + File.separator + input; + TEST_OUTPUT_FOLDER_NAME = "target" + File.separator + "tests" + File.separator + "standalone_output_ResolveAll_Active" + File.separator + input; File outputDir = new File(TEST_OUTPUT_FOLDER_NAME); outputDir.mkdirs(); diff --git a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/standalone/package-info.java b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/standalone/package-info.java similarity index 100% rename from tests/org.emftext.language.java.test/src/org/emftext/language/java/test/standalone/package-info.java rename to tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/standalone/package-info.java diff --git a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/xmi/JavaXMISerializationTest.java b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/xmi/JavaXMISerializationTest.java similarity index 96% rename from tests/org.emftext.language.java.test/src/org/emftext/language/java/test/xmi/JavaXMISerializationTest.java rename to tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/xmi/JavaXMISerializationTest.java index 534cac6b..9048d16c 100644 --- a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/xmi/JavaXMISerializationTest.java +++ b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/xmi/JavaXMISerializationTest.java @@ -47,8 +47,8 @@ public class JavaXMISerializationTest extends AbstractJaMoPPTests { - protected static final String TEST_INPUT_FOLDER_NAME = "src-input"; - protected static String TEST_OUTPUT_FOLDER_NAME = "output"; + protected static final String TEST_INPUT_FOLDER_NAME = "src" + File.separator + "test" + File.separator + "resources" + File.separator + "input"; + protected static String TEST_OUTPUT_FOLDER_NAME = "target" + File.separator + "tests" + File.separator + "output"; @BeforeAll public static void generalSetup() { diff --git a/tests/org.emftext.language.java.test/src/org/emftext/language/java/test/xmi/package-info.java b/tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/xmi/package-info.java similarity index 100% rename from tests/org.emftext.language.java.test/src/org/emftext/language/java/test/xmi/package-info.java rename to tests/org.emftext.language.java.test/src/test/java/org/emftext/language/java/test/xmi/package-info.java diff --git a/tests/org.emftext.language.java.test/src-input/AClass.java b/tests/org.emftext.language.java.test/src/test/resources/input/AClass.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/AClass.java rename to tests/org.emftext.language.java.test/src/test/resources/input/AClass.java diff --git a/tests/org.emftext.language.java.test/src-input/AnnotationInstances.java b/tests/org.emftext.language.java.test/src/test/resources/input/AnnotationInstances.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/AnnotationInstances.java rename to tests/org.emftext.language.java.test/src/test/resources/input/AnnotationInstances.java diff --git a/tests/org.emftext.language.java.test/src-input/Annotations.java b/tests/org.emftext.language.java.test/src/test/resources/input/Annotations.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/Annotations.java rename to tests/org.emftext.language.java.test/src/test/resources/input/Annotations.java diff --git a/tests/org.emftext.language.java.test/src-input/AnnotationsAsAnnotationArguments.java b/tests/org.emftext.language.java.test/src/test/resources/input/AnnotationsAsAnnotationArguments.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/AnnotationsAsAnnotationArguments.java rename to tests/org.emftext.language.java.test/src/test/resources/input/AnnotationsAsAnnotationArguments.java diff --git a/tests/org.emftext.language.java.test/src-input/AnnotationsBetweenKeywords.java b/tests/org.emftext.language.java.test/src/test/resources/input/AnnotationsBetweenKeywords.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/AnnotationsBetweenKeywords.java rename to tests/org.emftext.language.java.test/src/test/resources/input/AnnotationsBetweenKeywords.java diff --git a/tests/org.emftext.language.java.test/src-input/AnnotationsForAnnotations.java b/tests/org.emftext.language.java.test/src/test/resources/input/AnnotationsForAnnotations.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/AnnotationsForAnnotations.java rename to tests/org.emftext.language.java.test/src/test/resources/input/AnnotationsForAnnotations.java diff --git a/tests/org.emftext.language.java.test/src-input/AnnotationsForEnums.java b/tests/org.emftext.language.java.test/src/test/resources/input/AnnotationsForEnums.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/AnnotationsForEnums.java rename to tests/org.emftext.language.java.test/src/test/resources/input/AnnotationsForEnums.java diff --git a/tests/org.emftext.language.java.test/src-input/AnnotationsForInnerTypes.java b/tests/org.emftext.language.java.test/src/test/resources/input/AnnotationsForInnerTypes.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/AnnotationsForInnerTypes.java rename to tests/org.emftext.language.java.test/src/test/resources/input/AnnotationsForInnerTypes.java diff --git a/tests/org.emftext.language.java.test/src-input/AnnotationsForMethods.java b/tests/org.emftext.language.java.test/src/test/resources/input/AnnotationsForMethods.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/AnnotationsForMethods.java rename to tests/org.emftext.language.java.test/src/test/resources/input/AnnotationsForMethods.java diff --git a/tests/org.emftext.language.java.test/src-input/AnnotationsForParameters.java b/tests/org.emftext.language.java.test/src/test/resources/input/AnnotationsForParameters.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/AnnotationsForParameters.java rename to tests/org.emftext.language.java.test/src/test/resources/input/AnnotationsForParameters.java diff --git a/tests/org.emftext.language.java.test/src-input/AnnotationsForStatements.java b/tests/org.emftext.language.java.test/src/test/resources/input/AnnotationsForStatements.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/AnnotationsForStatements.java rename to tests/org.emftext.language.java.test/src/test/resources/input/AnnotationsForStatements.java diff --git a/tests/org.emftext.language.java.test/src-input/AnonymousEnum.java b/tests/org.emftext.language.java.test/src/test/resources/input/AnonymousEnum.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/AnonymousEnum.java rename to tests/org.emftext.language.java.test/src/test/resources/input/AnonymousEnum.java diff --git a/tests/org.emftext.language.java.test/src-input/AnonymousEnumWithArguments.java b/tests/org.emftext.language.java.test/src/test/resources/input/AnonymousEnumWithArguments.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/AnonymousEnumWithArguments.java rename to tests/org.emftext.language.java.test/src/test/resources/input/AnonymousEnumWithArguments.java diff --git a/tests/org.emftext.language.java.test/src-input/AnonymousInner.java b/tests/org.emftext.language.java.test/src/test/resources/input/AnonymousInner.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/AnonymousInner.java rename to tests/org.emftext.language.java.test/src/test/resources/input/AnonymousInner.java diff --git a/tests/org.emftext.language.java.test/src-input/Arguments.java b/tests/org.emftext.language.java.test/src/test/resources/input/Arguments.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/Arguments.java rename to tests/org.emftext.language.java.test/src/test/resources/input/Arguments.java diff --git a/tests/org.emftext.language.java.test/src-input/ArrayInitializers.java b/tests/org.emftext.language.java.test/src/test/resources/input/ArrayInitializers.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/ArrayInitializers.java rename to tests/org.emftext.language.java.test/src/test/resources/input/ArrayInitializers.java diff --git a/tests/org.emftext.language.java.test/src-input/ArraysInDeclarationsComplex.java b/tests/org.emftext.language.java.test/src/test/resources/input/ArraysInDeclarationsComplex.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/ArraysInDeclarationsComplex.java rename to tests/org.emftext.language.java.test/src/test/resources/input/ArraysInDeclarationsComplex.java diff --git a/tests/org.emftext.language.java.test/src-input/ArraysInDeclarationsSimple.java b/tests/org.emftext.language.java.test/src/test/resources/input/ArraysInDeclarationsSimple.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/ArraysInDeclarationsSimple.java rename to tests/org.emftext.language.java.test/src/test/resources/input/ArraysInDeclarationsSimple.java diff --git a/tests/org.emftext.language.java.test/src-input/AssertStatements.java b/tests/org.emftext.language.java.test/src/test/resources/input/AssertStatements.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/AssertStatements.java rename to tests/org.emftext.language.java.test/src/test/resources/input/AssertStatements.java diff --git a/tests/org.emftext.language.java.test/src-input/Assignments.java b/tests/org.emftext.language.java.test/src/test/resources/input/Assignments.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/Assignments.java rename to tests/org.emftext.language.java.test/src/test/resources/input/Assignments.java diff --git a/tests/org.emftext.language.java.test/src-input/BasicEnum.java b/tests/org.emftext.language.java.test/src/test/resources/input/BasicEnum.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/BasicEnum.java rename to tests/org.emftext.language.java.test/src/test/resources/input/BasicEnum.java diff --git a/tests/org.emftext.language.java.test/src-input/BasicEnumWithCommaAndSemicolonAtTheEnd.java b/tests/org.emftext.language.java.test/src/test/resources/input/BasicEnumWithCommaAndSemicolonAtTheEnd.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/BasicEnumWithCommaAndSemicolonAtTheEnd.java rename to tests/org.emftext.language.java.test/src/test/resources/input/BasicEnumWithCommaAndSemicolonAtTheEnd.java diff --git a/tests/org.emftext.language.java.test/src-input/BasicEnumWithCommaAtTheEnd.java b/tests/org.emftext.language.java.test/src/test/resources/input/BasicEnumWithCommaAtTheEnd.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/BasicEnumWithCommaAtTheEnd.java rename to tests/org.emftext.language.java.test/src/test/resources/input/BasicEnumWithCommaAtTheEnd.java diff --git a/tests/org.emftext.language.java.test/src-input/BasicEnumWithSemicolonAtTheEnd.java b/tests/org.emftext.language.java.test/src/test/resources/input/BasicEnumWithSemicolonAtTheEnd.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/BasicEnumWithSemicolonAtTheEnd.java rename to tests/org.emftext.language.java.test/src/test/resources/input/BasicEnumWithSemicolonAtTheEnd.java diff --git a/tests/org.emftext.language.java.test/src-input/Blocks.java b/tests/org.emftext.language.java.test/src/test/resources/input/Blocks.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/Blocks.java rename to tests/org.emftext.language.java.test/src/test/resources/input/Blocks.java diff --git a/tests/org.emftext.language.java.test/src-input/BooleanAssignments.java b/tests/org.emftext.language.java.test/src/test/resources/input/BooleanAssignments.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/BooleanAssignments.java rename to tests/org.emftext.language.java.test/src/test/resources/input/BooleanAssignments.java diff --git a/tests/org.emftext.language.java.test/src-input/BooleanExpressions.java b/tests/org.emftext.language.java.test/src/test/resources/input/BooleanExpressions.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/BooleanExpressions.java rename to tests/org.emftext.language.java.test/src/test/resources/input/BooleanExpressions.java diff --git a/tests/org.emftext.language.java.test/src-input/Casting.java b/tests/org.emftext.language.java.test/src/test/resources/input/Casting.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/Casting.java rename to tests/org.emftext.language.java.test/src/test/resources/input/Casting.java diff --git a/tests/org.emftext.language.java.test/src-input/ChainedCalls.java b/tests/org.emftext.language.java.test/src/test/resources/input/ChainedCalls.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/ChainedCalls.java rename to tests/org.emftext.language.java.test/src/test/resources/input/ChainedCalls.java diff --git a/tests/org.emftext.language.java.test/src-input/Class$$$$With$$$$In$$$$Name$$$$$.java b/tests/org.emftext.language.java.test/src/test/resources/input/Class$$$$With$$$$In$$$$Name$$$$$.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/Class$$$$With$$$$In$$$$Name$$$$$.java rename to tests/org.emftext.language.java.test/src/test/resources/input/Class$$$$With$$$$In$$$$Name$$$$$.java diff --git a/tests/org.emftext.language.java.test/src-input/ClassA.java b/tests/org.emftext.language.java.test/src/test/resources/input/ClassA.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/ClassA.java rename to tests/org.emftext.language.java.test/src/test/resources/input/ClassA.java diff --git a/tests/org.emftext.language.java.test/src-input/ClassB.java b/tests/org.emftext.language.java.test/src/test/resources/input/ClassB.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/ClassB.java rename to tests/org.emftext.language.java.test/src/test/resources/input/ClassB.java diff --git a/tests/org.emftext.language.java.test/src-input/ClassSemicolonOnly.java b/tests/org.emftext.language.java.test/src/test/resources/input/ClassSemicolonOnly.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/ClassSemicolonOnly.java rename to tests/org.emftext.language.java.test/src/test/resources/input/ClassSemicolonOnly.java diff --git a/tests/org.emftext.language.java.test/src-input/ClassWith$$InName.java b/tests/org.emftext.language.java.test/src/test/resources/input/ClassWith$$InName.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/ClassWith$$InName.java rename to tests/org.emftext.language.java.test/src/test/resources/input/ClassWith$$InName.java diff --git a/tests/org.emftext.language.java.test/src-input/ClassWith$InName.java b/tests/org.emftext.language.java.test/src/test/resources/input/ClassWith$InName.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/ClassWith$InName.java rename to tests/org.emftext.language.java.test/src/test/resources/input/ClassWith$InName.java diff --git a/tests/org.emftext.language.java.test/src-input/ClassWithDollarReferenced.java b/tests/org.emftext.language.java.test/src/test/resources/input/ClassWithDollarReferenced.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/ClassWithDollarReferenced.java rename to tests/org.emftext.language.java.test/src/test/resources/input/ClassWithDollarReferenced.java diff --git a/tests/org.emftext.language.java.test/src-input/ClassWithEnumeratingFieldDeclaration.java b/tests/org.emftext.language.java.test/src/test/resources/input/ClassWithEnumeratingFieldDeclaration.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/ClassWithEnumeratingFieldDeclaration.java rename to tests/org.emftext.language.java.test/src/test/resources/input/ClassWithEnumeratingFieldDeclaration.java diff --git a/tests/org.emftext.language.java.test/src-input/Comments.java b/tests/org.emftext.language.java.test/src/test/resources/input/Comments.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/Comments.java rename to tests/org.emftext.language.java.test/src/test/resources/input/Comments.java diff --git a/tests/org.emftext.language.java.test/src-input/CommentsAtEOF.java b/tests/org.emftext.language.java.test/src/test/resources/input/CommentsAtEOF.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/CommentsAtEOF.java rename to tests/org.emftext.language.java.test/src/test/resources/input/CommentsAtEOF.java diff --git a/tests/org.emftext.language.java.test/src-input/CommentsBetweenCaseStatements.java b/tests/org.emftext.language.java.test/src/test/resources/input/CommentsBetweenCaseStatements.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/CommentsBetweenCaseStatements.java rename to tests/org.emftext.language.java.test/src/test/resources/input/CommentsBetweenCaseStatements.java diff --git a/tests/org.emftext.language.java.test/src-input/CommentsBetweenCatchClauses.java b/tests/org.emftext.language.java.test/src/test/resources/input/CommentsBetweenCatchClauses.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/CommentsBetweenCatchClauses.java rename to tests/org.emftext.language.java.test/src/test/resources/input/CommentsBetweenCatchClauses.java diff --git a/tests/org.emftext.language.java.test/src-input/CommentsBetweenConstructorArguments.java b/tests/org.emftext.language.java.test/src/test/resources/input/CommentsBetweenConstructorArguments.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/CommentsBetweenConstructorArguments.java rename to tests/org.emftext.language.java.test/src/test/resources/input/CommentsBetweenConstructorArguments.java diff --git a/tests/org.emftext.language.java.test/src-input/CommentsBetweenMethodArguments.java b/tests/org.emftext.language.java.test/src/test/resources/input/CommentsBetweenMethodArguments.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/CommentsBetweenMethodArguments.java rename to tests/org.emftext.language.java.test/src/test/resources/input/CommentsBetweenMethodArguments.java diff --git a/tests/org.emftext.language.java.test/src-input/CommentsBetweenReferenceSequenceParts.java b/tests/org.emftext.language.java.test/src/test/resources/input/CommentsBetweenReferenceSequenceParts.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/CommentsBetweenReferenceSequenceParts.java rename to tests/org.emftext.language.java.test/src/test/resources/input/CommentsBetweenReferenceSequenceParts.java diff --git a/tests/org.emftext.language.java.test/src-input/CommentsInArrayInitializers.java b/tests/org.emftext.language.java.test/src/test/resources/input/CommentsInArrayInitializers.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/CommentsInArrayInitializers.java rename to tests/org.emftext.language.java.test/src/test/resources/input/CommentsInArrayInitializers.java diff --git a/tests/org.emftext.language.java.test/src-input/CommentsInFieldDeclaration.java b/tests/org.emftext.language.java.test/src/test/resources/input/CommentsInFieldDeclaration.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/CommentsInFieldDeclaration.java rename to tests/org.emftext.language.java.test/src/test/resources/input/CommentsInFieldDeclaration.java diff --git a/tests/org.emftext.language.java.test/src-input/CommentsInParExpression.java b/tests/org.emftext.language.java.test/src/test/resources/input/CommentsInParExpression.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/CommentsInParExpression.java rename to tests/org.emftext.language.java.test/src/test/resources/input/CommentsInParExpression.java diff --git a/tests/org.emftext.language.java.test/src-input/ConditionalExpressions.java b/tests/org.emftext.language.java.test/src/test/resources/input/ConditionalExpressions.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/ConditionalExpressions.java rename to tests/org.emftext.language.java.test/src/test/resources/input/ConditionalExpressions.java diff --git a/tests/org.emftext.language.java.test/src-input/ConditionalStatements.java b/tests/org.emftext.language.java.test/src/test/resources/input/ConditionalStatements.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/ConditionalStatements.java rename to tests/org.emftext.language.java.test/src/test/resources/input/ConditionalStatements.java diff --git a/tests/org.emftext.language.java.test/src-input/ConstructorCalls.java b/tests/org.emftext.language.java.test/src/test/resources/input/ConstructorCalls.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/ConstructorCalls.java rename to tests/org.emftext.language.java.test/src/test/resources/input/ConstructorCalls.java diff --git a/tests/org.emftext.language.java.test/src-input/DeclarationStatements.java b/tests/org.emftext.language.java.test/src/test/resources/input/DeclarationStatements.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/DeclarationStatements.java rename to tests/org.emftext.language.java.test/src/test/resources/input/DeclarationStatements.java diff --git a/tests/org.emftext.language.java.test/src-input/EmptyClass.java b/tests/org.emftext.language.java.test/src/test/resources/input/EmptyClass.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/EmptyClass.java rename to tests/org.emftext.language.java.test/src/test/resources/input/EmptyClass.java diff --git a/tests/org.emftext.language.java.test/src-input/EmptyEnum.java b/tests/org.emftext.language.java.test/src/test/resources/input/EmptyEnum.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/EmptyEnum.java rename to tests/org.emftext.language.java.test/src/test/resources/input/EmptyEnum.java diff --git a/tests/org.emftext.language.java.test/src-input/EmptyEnumWithSemicolon.java b/tests/org.emftext.language.java.test/src/test/resources/input/EmptyEnumWithSemicolon.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/EmptyEnumWithSemicolon.java rename to tests/org.emftext.language.java.test/src/test/resources/input/EmptyEnumWithSemicolon.java diff --git a/tests/org.emftext.language.java.test/src-input/EmptyInterface.java b/tests/org.emftext.language.java.test/src/test/resources/input/EmptyInterface.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/EmptyInterface.java rename to tests/org.emftext.language.java.test/src/test/resources/input/EmptyInterface.java diff --git a/tests/org.emftext.language.java.test/src-input/EnumImplementingTwoInterfaces.java b/tests/org.emftext.language.java.test/src/test/resources/input/EnumImplementingTwoInterfaces.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/EnumImplementingTwoInterfaces.java rename to tests/org.emftext.language.java.test/src/test/resources/input/EnumImplementingTwoInterfaces.java diff --git a/tests/org.emftext.language.java.test/src-input/EnumValueMethodsUse.java b/tests/org.emftext.language.java.test/src/test/resources/input/EnumValueMethodsUse.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/EnumValueMethodsUse.java rename to tests/org.emftext.language.java.test/src/test/resources/input/EnumValueMethodsUse.java diff --git a/tests/org.emftext.language.java.test/src-input/EnumWithConstructor.java b/tests/org.emftext.language.java.test/src/test/resources/input/EnumWithConstructor.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/EnumWithConstructor.java rename to tests/org.emftext.language.java.test/src/test/resources/input/EnumWithConstructor.java diff --git a/tests/org.emftext.language.java.test/src-input/EnumWithMember.java b/tests/org.emftext.language.java.test/src/test/resources/input/EnumWithMember.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/EnumWithMember.java rename to tests/org.emftext.language.java.test/src/test/resources/input/EnumWithMember.java diff --git a/tests/org.emftext.language.java.test/src-input/EqualityExpression.java b/tests/org.emftext.language.java.test/src/test/resources/input/EqualityExpression.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/EqualityExpression.java rename to tests/org.emftext.language.java.test/src/test/resources/input/EqualityExpression.java diff --git a/tests/org.emftext.language.java.test/src-input/ExceptionThrowing.java b/tests/org.emftext.language.java.test/src/test/resources/input/ExceptionThrowing.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/ExceptionThrowing.java rename to tests/org.emftext.language.java.test/src/test/resources/input/ExceptionThrowing.java diff --git a/tests/org.emftext.language.java.test/src-input/ExplicitConstructorCalls.java b/tests/org.emftext.language.java.test/src/test/resources/input/ExplicitConstructorCalls.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/ExplicitConstructorCalls.java rename to tests/org.emftext.language.java.test/src/test/resources/input/ExplicitConstructorCalls.java diff --git a/tests/org.emftext.language.java.test/src-input/ExplicitGenericConstructorCalls.java b/tests/org.emftext.language.java.test/src/test/resources/input/ExplicitGenericConstructorCalls.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/ExplicitGenericConstructorCalls.java rename to tests/org.emftext.language.java.test/src/test/resources/input/ExplicitGenericConstructorCalls.java diff --git a/tests/org.emftext.language.java.test/src-input/ExplicitGenericInvocation.java b/tests/org.emftext.language.java.test/src/test/resources/input/ExplicitGenericInvocation.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/ExplicitGenericInvocation.java rename to tests/org.emftext.language.java.test/src/test/resources/input/ExplicitGenericInvocation.java diff --git a/tests/org.emftext.language.java.test/src-input/Expressions.java b/tests/org.emftext.language.java.test/src/test/resources/input/Expressions.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/Expressions.java rename to tests/org.emftext.language.java.test/src/test/resources/input/Expressions.java diff --git a/tests/org.emftext.language.java.test/src-input/ExpressionsAsMethodArguments.java b/tests/org.emftext.language.java.test/src/test/resources/input/ExpressionsAsMethodArguments.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/ExpressionsAsMethodArguments.java rename to tests/org.emftext.language.java.test/src/test/resources/input/ExpressionsAsMethodArguments.java diff --git a/tests/org.emftext.language.java.test/src-input/ForEachLoop.java b/tests/org.emftext.language.java.test/src/test/resources/input/ForEachLoop.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/ForEachLoop.java rename to tests/org.emftext.language.java.test/src/test/resources/input/ForEachLoop.java diff --git a/tests/org.emftext.language.java.test/src-input/FullQualifiedNameReferences.java b/tests/org.emftext.language.java.test/src/test/resources/input/FullQualifiedNameReferences.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/FullQualifiedNameReferences.java rename to tests/org.emftext.language.java.test/src/test/resources/input/FullQualifiedNameReferences.java diff --git a/tests/org.emftext.language.java.test/src-input/GenericConstructorCalls.java b/tests/org.emftext.language.java.test/src/test/resources/input/GenericConstructorCalls.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/GenericConstructorCalls.java rename to tests/org.emftext.language.java.test/src/test/resources/input/GenericConstructorCalls.java diff --git a/tests/org.emftext.language.java.test/src-input/GenericConstructors.java b/tests/org.emftext.language.java.test/src/test/resources/input/GenericConstructors.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/GenericConstructors.java rename to tests/org.emftext.language.java.test/src/test/resources/input/GenericConstructors.java diff --git a/tests/org.emftext.language.java.test/src-input/GenericMethods.java b/tests/org.emftext.language.java.test/src/test/resources/input/GenericMethods.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/GenericMethods.java rename to tests/org.emftext.language.java.test/src/test/resources/input/GenericMethods.java diff --git a/tests/org.emftext.language.java.test/src-input/GenericSuperConstructors.java b/tests/org.emftext.language.java.test/src/test/resources/input/GenericSuperConstructors.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/GenericSuperConstructors.java rename to tests/org.emftext.language.java.test/src/test/resources/input/GenericSuperConstructors.java diff --git a/tests/org.emftext.language.java.test/src-input/IExtendsMultiple.java b/tests/org.emftext.language.java.test/src/test/resources/input/IExtendsMultiple.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/IExtendsMultiple.java rename to tests/org.emftext.language.java.test/src/test/resources/input/IExtendsMultiple.java diff --git a/tests/org.emftext.language.java.test/src-input/IGenericMembers.java b/tests/org.emftext.language.java.test/src/test/resources/input/IGenericMembers.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/IGenericMembers.java rename to tests/org.emftext.language.java.test/src/test/resources/input/IGenericMembers.java diff --git a/tests/org.emftext.language.java.test/src-input/IMembers.java b/tests/org.emftext.language.java.test/src/test/resources/input/IMembers.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/IMembers.java rename to tests/org.emftext.language.java.test/src/test/resources/input/IMembers.java diff --git a/tests/org.emftext.language.java.test/src-input/IOneMethod.java b/tests/org.emftext.language.java.test/src/test/resources/input/IOneMethod.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/IOneMethod.java rename to tests/org.emftext.language.java.test/src/test/resources/input/IOneMethod.java diff --git a/tests/org.emftext.language.java.test/src-input/ISemicolonOnly.java b/tests/org.emftext.language.java.test/src/test/resources/input/ISemicolonOnly.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/ISemicolonOnly.java rename to tests/org.emftext.language.java.test/src/test/resources/input/ISemicolonOnly.java diff --git a/tests/org.emftext.language.java.test/src-input/ITwoPublicVoidMethods.java b/tests/org.emftext.language.java.test/src/test/resources/input/ITwoPublicVoidMethods.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/ITwoPublicVoidMethods.java rename to tests/org.emftext.language.java.test/src/test/resources/input/ITwoPublicVoidMethods.java diff --git a/tests/org.emftext.language.java.test/src-input/IWithComments.java b/tests/org.emftext.language.java.test/src/test/resources/input/IWithComments.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/IWithComments.java rename to tests/org.emftext.language.java.test/src/test/resources/input/IWithComments.java diff --git a/tests/org.emftext.language.java.test/src-input/Import1.java b/tests/org.emftext.language.java.test/src/test/resources/input/Import1.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/Import1.java rename to tests/org.emftext.language.java.test/src/test/resources/input/Import1.java diff --git a/tests/org.emftext.language.java.test/src-input/Import2.java b/tests/org.emftext.language.java.test/src/test/resources/input/Import2.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/Import2.java rename to tests/org.emftext.language.java.test/src/test/resources/input/Import2.java diff --git a/tests/org.emftext.language.java.test/src-input/InstanceOfArrayType.java b/tests/org.emftext.language.java.test/src/test/resources/input/InstanceOfArrayType.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/InstanceOfArrayType.java rename to tests/org.emftext.language.java.test/src/test/resources/input/InstanceOfArrayType.java diff --git a/tests/org.emftext.language.java.test/src-input/Interface1.java b/tests/org.emftext.language.java.test/src/test/resources/input/Interface1.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/Interface1.java rename to tests/org.emftext.language.java.test/src/test/resources/input/Interface1.java diff --git a/tests/org.emftext.language.java.test/src-input/Interface2.java b/tests/org.emftext.language.java.test/src/test/resources/input/Interface2.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/Interface2.java rename to tests/org.emftext.language.java.test/src/test/resources/input/Interface2.java diff --git a/tests/org.emftext.language.java.test/src-input/Interface3.java b/tests/org.emftext.language.java.test/src/test/resources/input/Interface3.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/Interface3.java rename to tests/org.emftext.language.java.test/src/test/resources/input/Interface3.java diff --git a/tests/org.emftext.language.java.test/src-input/InterfaceUse.java b/tests/org.emftext.language.java.test/src/test/resources/input/InterfaceUse.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/InterfaceUse.java rename to tests/org.emftext.language.java.test/src/test/resources/input/InterfaceUse.java diff --git a/tests/org.emftext.language.java.test/src-input/JavaDocCommentBlock.java b/tests/org.emftext.language.java.test/src/test/resources/input/JavaDocCommentBlock.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/JavaDocCommentBlock.java rename to tests/org.emftext.language.java.test/src/test/resources/input/JavaDocCommentBlock.java diff --git a/tests/org.emftext.language.java.test/src-input/JavaDocCommentInClass.java b/tests/org.emftext.language.java.test/src/test/resources/input/JavaDocCommentInClass.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/JavaDocCommentInClass.java rename to tests/org.emftext.language.java.test/src/test/resources/input/JavaDocCommentInClass.java diff --git a/tests/org.emftext.language.java.test/src-input/JavaDocCommentInField.java b/tests/org.emftext.language.java.test/src/test/resources/input/JavaDocCommentInField.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/JavaDocCommentInField.java rename to tests/org.emftext.language.java.test/src/test/resources/input/JavaDocCommentInField.java diff --git a/tests/org.emftext.language.java.test/src-input/JumpLabelStatements.java b/tests/org.emftext.language.java.test/src/test/resources/input/JumpLabelStatements.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/JumpLabelStatements.java rename to tests/org.emftext.language.java.test/src/test/resources/input/JumpLabelStatements.java diff --git a/tests/org.emftext.language.java.test/src-input/LegalIdentifiers.java b/tests/org.emftext.language.java.test/src/test/resources/input/LegalIdentifiers.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/LegalIdentifiers.java rename to tests/org.emftext.language.java.test/src/test/resources/input/LegalIdentifiers.java diff --git a/tests/org.emftext.language.java.test/src-input/Literals.java b/tests/org.emftext.language.java.test/src/test/resources/input/Literals.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/Literals.java rename to tests/org.emftext.language.java.test/src/test/resources/input/Literals.java diff --git a/tests/org.emftext.language.java.test/src-input/LocalVariableDeclarations.java b/tests/org.emftext.language.java.test/src/test/resources/input/LocalVariableDeclarations.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/LocalVariableDeclarations.java rename to tests/org.emftext.language.java.test/src/test/resources/input/LocalVariableDeclarations.java diff --git a/tests/org.emftext.language.java.test/src-input/LoopStatements.java b/tests/org.emftext.language.java.test/src/test/resources/input/LoopStatements.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/LoopStatements.java rename to tests/org.emftext.language.java.test/src/test/resources/input/LoopStatements.java diff --git a/tests/org.emftext.language.java.test/src-input/Members.java b/tests/org.emftext.language.java.test/src/test/resources/input/Members.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/Members.java rename to tests/org.emftext.language.java.test/src/test/resources/input/Members.java diff --git a/tests/org.emftext.language.java.test/src-input/MethodCallsWithLocalTypeReferences.java b/tests/org.emftext.language.java.test/src/test/resources/input/MethodCallsWithLocalTypeReferences.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/MethodCallsWithLocalTypeReferences.java rename to tests/org.emftext.language.java.test/src/test/resources/input/MethodCallsWithLocalTypeReferences.java diff --git a/tests/org.emftext.language.java.test/src-input/MethodOverride.java b/tests/org.emftext.language.java.test/src/test/resources/input/MethodOverride.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/MethodOverride.java rename to tests/org.emftext.language.java.test/src/test/resources/input/MethodOverride.java diff --git a/tests/org.emftext.language.java.test/src-input/Modifiers.java b/tests/org.emftext.language.java.test/src/test/resources/input/Modifiers.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/Modifiers.java rename to tests/org.emftext.language.java.test/src/test/resources/input/Modifiers.java diff --git a/tests/org.emftext.language.java.test/src-input/MultipleImplements.java b/tests/org.emftext.language.java.test/src/test/resources/input/MultipleImplements.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/MultipleImplements.java rename to tests/org.emftext.language.java.test/src/test/resources/input/MultipleImplements.java diff --git a/tests/org.emftext.language.java.test/src-input/Multiplications.java b/tests/org.emftext.language.java.test/src/test/resources/input/Multiplications.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/Multiplications.java rename to tests/org.emftext.language.java.test/src/test/resources/input/Multiplications.java diff --git a/tests/org.emftext.language.java.test/src-input/NoTypeArgument.java b/tests/org.emftext.language.java.test/src/test/resources/input/NoTypeArgument.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/NoTypeArgument.java rename to tests/org.emftext.language.java.test/src/test/resources/input/NoTypeArgument.java diff --git a/tests/org.emftext.language.java.test/src-input/ParametersWithModifiers.java b/tests/org.emftext.language.java.test/src/test/resources/input/ParametersWithModifiers.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/ParametersWithModifiers.java rename to tests/org.emftext.language.java.test/src/test/resources/input/ParametersWithModifiers.java diff --git a/tests/org.emftext.language.java.test/src-input/PrimitiveTypeArrays.java b/tests/org.emftext.language.java.test/src/test/resources/input/PrimitiveTypeArrays.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/PrimitiveTypeArrays.java rename to tests/org.emftext.language.java.test/src/test/resources/input/PrimitiveTypeArrays.java diff --git a/tests/org.emftext.language.java.test/src-input/RoundedLiterals.java b/tests/org.emftext.language.java.test/src/test/resources/input/RoundedLiterals.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/RoundedLiterals.java rename to tests/org.emftext.language.java.test/src/test/resources/input/RoundedLiterals.java diff --git a/tests/org.emftext.language.java.test/src-input/SemicolonAfterExpressions.java b/tests/org.emftext.language.java.test/src/test/resources/input/SemicolonAfterExpressions.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/SemicolonAfterExpressions.java rename to tests/org.emftext.language.java.test/src/test/resources/input/SemicolonAfterExpressions.java diff --git a/tests/org.emftext.language.java.test/src-input/SemicolonAfterMembers.java b/tests/org.emftext.language.java.test/src/test/resources/input/SemicolonAfterMembers.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/SemicolonAfterMembers.java rename to tests/org.emftext.language.java.test/src/test/resources/input/SemicolonAfterMembers.java diff --git a/tests/org.emftext.language.java.test/src-input/SimpleAnnotations.java b/tests/org.emftext.language.java.test/src/test/resources/input/SimpleAnnotations.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/SimpleAnnotations.java rename to tests/org.emftext.language.java.test/src/test/resources/input/SimpleAnnotations.java diff --git a/tests/org.emftext.language.java.test/src-input/SimpleMethodCalls.java b/tests/org.emftext.language.java.test/src/test/resources/input/SimpleMethodCalls.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/SimpleMethodCalls.java rename to tests/org.emftext.language.java.test/src/test/resources/input/SimpleMethodCalls.java diff --git a/tests/org.emftext.language.java.test/src-input/SpecialCharacters.java b/tests/org.emftext.language.java.test/src/test/resources/input/SpecialCharacters.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/SpecialCharacters.java rename to tests/org.emftext.language.java.test/src/test/resources/input/SpecialCharacters.java diff --git a/tests/org.emftext.language.java.test/src-input/StaticCalls.java b/tests/org.emftext.language.java.test/src/test/resources/input/StaticCalls.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/StaticCalls.java rename to tests/org.emftext.language.java.test/src/test/resources/input/StaticCalls.java diff --git a/tests/org.emftext.language.java.test/src-input/StaticImports.java b/tests/org.emftext.language.java.test/src/test/resources/input/StaticImports.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/StaticImports.java rename to tests/org.emftext.language.java.test/src/test/resources/input/StaticImports.java diff --git a/tests/org.emftext.language.java.test/src-input/StringLiteralReferencing.java b/tests/org.emftext.language.java.test/src/test/resources/input/StringLiteralReferencing.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/StringLiteralReferencing.java rename to tests/org.emftext.language.java.test/src/test/resources/input/StringLiteralReferencing.java diff --git a/tests/org.emftext.language.java.test/src-input/SuperKeyword.java b/tests/org.emftext.language.java.test/src/test/resources/input/SuperKeyword.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/SuperKeyword.java rename to tests/org.emftext.language.java.test/src/test/resources/input/SuperKeyword.java diff --git a/tests/org.emftext.language.java.test/src-input/SwitchStatements.java b/tests/org.emftext.language.java.test/src/test/resources/input/SwitchStatements.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/SwitchStatements.java rename to tests/org.emftext.language.java.test/src/test/resources/input/SwitchStatements.java diff --git a/tests/org.emftext.language.java.test/src-input/Synchronized.java b/tests/org.emftext.language.java.test/src/test/resources/input/Synchronized.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/Synchronized.java rename to tests/org.emftext.language.java.test/src/test/resources/input/Synchronized.java diff --git a/tests/org.emftext.language.java.test/src-input/SynchronizedStatements.java b/tests/org.emftext.language.java.test/src/test/resources/input/SynchronizedStatements.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/SynchronizedStatements.java rename to tests/org.emftext.language.java.test/src/test/resources/input/SynchronizedStatements.java diff --git a/tests/org.emftext.language.java.test/src-input/TempLiterals.java b/tests/org.emftext.language.java.test/src/test/resources/input/TempLiterals.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/TempLiterals.java rename to tests/org.emftext.language.java.test/src/test/resources/input/TempLiterals.java diff --git a/tests/org.emftext.language.java.test/src-input/ThrowStatements.java b/tests/org.emftext.language.java.test/src/test/resources/input/ThrowStatements.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/ThrowStatements.java rename to tests/org.emftext.language.java.test/src/test/resources/input/ThrowStatements.java diff --git a/tests/org.emftext.language.java.test/src-input/TryCatchStatements.java b/tests/org.emftext.language.java.test/src/test/resources/input/TryCatchStatements.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/TryCatchStatements.java rename to tests/org.emftext.language.java.test/src/test/resources/input/TryCatchStatements.java diff --git a/tests/org.emftext.language.java.test/src-input/TypeParameters.java b/tests/org.emftext.language.java.test/src/test/resources/input/TypeParameters.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/TypeParameters.java rename to tests/org.emftext.language.java.test/src/test/resources/input/TypeParameters.java diff --git a/tests/org.emftext.language.java.test/src-input/TypeReferencing.java b/tests/org.emftext.language.java.test/src/test/resources/input/TypeReferencing.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/TypeReferencing.java rename to tests/org.emftext.language.java.test/src/test/resources/input/TypeReferencing.java diff --git a/tests/org.emftext.language.java.test/src-input/TypeReferencingExternal.java b/tests/org.emftext.language.java.test/src/test/resources/input/TypeReferencingExternal.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/TypeReferencingExternal.java rename to tests/org.emftext.language.java.test/src/test/resources/input/TypeReferencingExternal.java diff --git a/tests/org.emftext.language.java.test/src-input/UnaryExpressions.java b/tests/org.emftext.language.java.test/src/test/resources/input/UnaryExpressions.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/UnaryExpressions.java rename to tests/org.emftext.language.java.test/src/test/resources/input/UnaryExpressions.java diff --git a/tests/org.emftext.language.java.test/src-input/UnicodeSurrogateCharacters.java b/tests/org.emftext.language.java.test/src/test/resources/input/UnicodeSurrogateCharacters.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/UnicodeSurrogateCharacters.java rename to tests/org.emftext.language.java.test/src/test/resources/input/UnicodeSurrogateCharacters.java diff --git a/tests/org.emftext.language.java.test/src-input/VariableLengthArgumentList.java b/tests/org.emftext.language.java.test/src/test/resources/input/VariableLengthArgumentList.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/VariableLengthArgumentList.java rename to tests/org.emftext.language.java.test/src/test/resources/input/VariableLengthArgumentList.java diff --git a/tests/org.emftext.language.java.test/src-input/VariableReferencing.java b/tests/org.emftext.language.java.test/src/test/resources/input/VariableReferencing.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/VariableReferencing.java rename to tests/org.emftext.language.java.test/src/test/resources/input/VariableReferencing.java diff --git a/tests/org.emftext.language.java.test/src-input/bugs/Bug1695.java b/tests/org.emftext.language.java.test/src/test/resources/input/bugs/Bug1695.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/bugs/Bug1695.java rename to tests/org.emftext.language.java.test/src/test/resources/input/bugs/Bug1695.java diff --git a/tests/org.emftext.language.java.test/src-input/locations/Location.java b/tests/org.emftext.language.java.test/src/test/resources/input/locations/Location.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/locations/Location.java rename to tests/org.emftext.language.java.test/src/test/resources/input/locations/Location.java diff --git a/tests/org.emftext.language.java.test/src-input/mbtp/C1.java b/tests/org.emftext.language.java.test/src/test/resources/input/mbtp/C1.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/mbtp/C1.java rename to tests/org.emftext.language.java.test/src/test/resources/input/mbtp/C1.java diff --git a/tests/org.emftext.language.java.test/src-input/mbtp/C2.java b/tests/org.emftext.language.java.test/src/test/resources/input/mbtp/C2.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/mbtp/C2.java rename to tests/org.emftext.language.java.test/src/test/resources/input/mbtp/C2.java diff --git a/tests/org.emftext.language.java.test/src-input/mbtp/C3.java b/tests/org.emftext.language.java.test/src/test/resources/input/mbtp/C3.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/mbtp/C3.java rename to tests/org.emftext.language.java.test/src/test/resources/input/mbtp/C3.java diff --git a/tests/org.emftext.language.java.test/src-input/pkg/ClassWith$In$$Pkg.java b/tests/org.emftext.language.java.test/src/test/resources/input/pkg/ClassWith$In$$Pkg.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/pkg/ClassWith$In$$Pkg.java rename to tests/org.emftext.language.java.test/src/test/resources/input/pkg/ClassWith$In$$Pkg.java diff --git a/tests/org.emftext.language.java.test/src-input/pkg/CrazyUnicode.java b/tests/org.emftext.language.java.test/src/test/resources/input/pkg/CrazyUnicode.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/pkg/CrazyUnicode.java rename to tests/org.emftext.language.java.test/src/test/resources/input/pkg/CrazyUnicode.java diff --git a/tests/org.emftext.language.java.test/src-input/pkg/EmptyClass.java b/tests/org.emftext.language.java.test/src/test/resources/input/pkg/EmptyClass.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/pkg/EmptyClass.java rename to tests/org.emftext.language.java.test/src/test/resources/input/pkg/EmptyClass.java diff --git a/tests/org.emftext.language.java.test/src-input/pkg/EscapedStrings.java b/tests/org.emftext.language.java.test/src/test/resources/input/pkg/EscapedStrings.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/pkg/EscapedStrings.java rename to tests/org.emftext.language.java.test/src/test/resources/input/pkg/EscapedStrings.java diff --git a/tests/org.emftext.language.java.test/src-input/pkg/NumberLiterals.java b/tests/org.emftext.language.java.test/src/test/resources/input/pkg/NumberLiterals.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/pkg/NumberLiterals.java rename to tests/org.emftext.language.java.test/src/test/resources/input/pkg/NumberLiterals.java diff --git a/tests/org.emftext.language.java.test/src-input/pkg/PackageAnnotation.java b/tests/org.emftext.language.java.test/src/test/resources/input/pkg/PackageAnnotation.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/pkg/PackageAnnotation.java rename to tests/org.emftext.language.java.test/src/test/resources/input/pkg/PackageAnnotation.java diff --git a/tests/org.emftext.language.java.test/src-input/pkg/UsingAnnotations.java b/tests/org.emftext.language.java.test/src/test/resources/input/pkg/UsingAnnotations.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/pkg/UsingAnnotations.java rename to tests/org.emftext.language.java.test/src/test/resources/input/pkg/UsingAnnotations.java diff --git a/tests/org.emftext.language.java.test/src-input/pkg/inner/ClassWith$In$$Inner$Pkg.java b/tests/org.emftext.language.java.test/src/test/resources/input/pkg/inner/ClassWith$In$$Inner$Pkg.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/pkg/inner/ClassWith$In$$Inner$Pkg.java rename to tests/org.emftext.language.java.test/src/test/resources/input/pkg/inner/ClassWith$In$$Inner$Pkg.java diff --git a/tests/org.emftext.language.java.test/src-input/pkg/inner/Inner.java b/tests/org.emftext.language.java.test/src/test/resources/input/pkg/inner/Inner.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/pkg/inner/Inner.java rename to tests/org.emftext.language.java.test/src/test/resources/input/pkg/inner/Inner.java diff --git a/tests/org.emftext.language.java.test/src-input/pkg/package-info.java b/tests/org.emftext.language.java.test/src/test/resources/input/pkg/package-info.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/pkg/package-info.java rename to tests/org.emftext.language.java.test/src/test/resources/input/pkg/package-info.java diff --git a/tests/org.emftext.language.java.test/src-input/pkg2/package-info.java b/tests/org.emftext.language.java.test/src/test/resources/input/pkg2/package-info.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/pkg2/package-info.java rename to tests/org.emftext.language.java.test/src/test/resources/input/pkg2/package-info.java diff --git a/tests/org.emftext.language.java.test/src-input/pkg2/pkg3/PackageAnnotation.java b/tests/org.emftext.language.java.test/src/test/resources/input/pkg2/pkg3/PackageAnnotation.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/pkg2/pkg3/PackageAnnotation.java rename to tests/org.emftext.language.java.test/src/test/resources/input/pkg2/pkg3/PackageAnnotation.java diff --git a/tests/org.emftext.language.java.test/src-input/pkg2/pkg3/Pkg2Enum.java b/tests/org.emftext.language.java.test/src/test/resources/input/pkg2/pkg3/Pkg2Enum.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/pkg2/pkg3/Pkg2Enum.java rename to tests/org.emftext.language.java.test/src/test/resources/input/pkg2/pkg3/Pkg2Enum.java diff --git a/tests/org.emftext.language.java.test/src-input/pkg2/pkg3/pkg4/PackageAnnotation.java b/tests/org.emftext.language.java.test/src/test/resources/input/pkg2/pkg3/pkg4/PackageAnnotation.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/pkg2/pkg3/pkg4/PackageAnnotation.java rename to tests/org.emftext.language.java.test/src/test/resources/input/pkg2/pkg3/pkg4/PackageAnnotation.java diff --git a/tests/org.emftext.language.java.test/src-input/pkg2/pkg3/pkg4/package-info.java b/tests/org.emftext.language.java.test/src/test/resources/input/pkg2/pkg3/pkg4/package-info.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/pkg2/pkg3/pkg4/package-info.java rename to tests/org.emftext.language.java.test/src/test/resources/input/pkg2/pkg3/pkg4/package-info.java diff --git a/tests/org.emftext.language.java.test/src-input/refs/AnonymousClasses.java b/tests/org.emftext.language.java.test/src/test/resources/input/refs/AnonymousClasses.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/refs/AnonymousClasses.java rename to tests/org.emftext.language.java.test/src/test/resources/input/refs/AnonymousClasses.java diff --git a/tests/org.emftext.language.java.test/src-input/refs/FieldLambdaExpressions.java b/tests/org.emftext.language.java.test/src/test/resources/input/refs/FieldLambdaExpressions.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/refs/FieldLambdaExpressions.java rename to tests/org.emftext.language.java.test/src/test/resources/input/refs/FieldLambdaExpressions.java diff --git a/tests/org.emftext.language.java.test/src-input/refs/LambdaExpressionRefs.java b/tests/org.emftext.language.java.test/src/test/resources/input/refs/LambdaExpressionRefs.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/refs/LambdaExpressionRefs.java rename to tests/org.emftext.language.java.test/src/test/resources/input/refs/LambdaExpressionRefs.java diff --git a/tests/org.emftext.language.java.test/src-input/refs/LambdaExpressionRefs2.java b/tests/org.emftext.language.java.test/src/test/resources/input/refs/LambdaExpressionRefs2.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/refs/LambdaExpressionRefs2.java rename to tests/org.emftext.language.java.test/src/test/resources/input/refs/LambdaExpressionRefs2.java diff --git a/tests/org.emftext.language.java.test/src-input/refs/LambdaExpressionRefs3.java b/tests/org.emftext.language.java.test/src/test/resources/input/refs/LambdaExpressionRefs3.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/refs/LambdaExpressionRefs3.java rename to tests/org.emftext.language.java.test/src/test/resources/input/refs/LambdaExpressionRefs3.java diff --git a/tests/org.emftext.language.java.test/src-input/refs/LambdaExpressionRefs4.java b/tests/org.emftext.language.java.test/src/test/resources/input/refs/LambdaExpressionRefs4.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/refs/LambdaExpressionRefs4.java rename to tests/org.emftext.language.java.test/src/test/resources/input/refs/LambdaExpressionRefs4.java diff --git a/tests/org.emftext.language.java.test/src-input/refs/LocalClasses.java b/tests/org.emftext.language.java.test/src/test/resources/input/refs/LocalClasses.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/refs/LocalClasses.java rename to tests/org.emftext.language.java.test/src/test/resources/input/refs/LocalClasses.java diff --git a/tests/org.emftext.language.java.test/src-input/refs/NestedLambdaExpressions.java b/tests/org.emftext.language.java.test/src/test/resources/input/refs/NestedLambdaExpressions.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/refs/NestedLambdaExpressions.java rename to tests/org.emftext.language.java.test/src/test/resources/input/refs/NestedLambdaExpressions.java diff --git a/tests/org.emftext.language.java.test/src-input/refs/ToArray.java b/tests/org.emftext.language.java.test/src/test/resources/input/refs/ToArray.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/refs/ToArray.java rename to tests/org.emftext.language.java.test/src/test/resources/input/refs/ToArray.java diff --git a/tests/org.emftext.language.java.test/src-input/refs/VarLengthRef.java b/tests/org.emftext.language.java.test/src/test/resources/input/refs/VarLengthRef.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/refs/VarLengthRef.java rename to tests/org.emftext.language.java.test/src/test/resources/input/refs/VarLengthRef.java diff --git a/tests/org.emftext.language.java.test/src-input/resolving/MethodCalls.java b/tests/org.emftext.language.java.test/src/test/resources/input/resolving/MethodCalls.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/resolving/MethodCalls.java rename to tests/org.emftext.language.java.test/src/test/resources/input/resolving/MethodCalls.java diff --git a/tests/org.emftext.language.java.test/src-input/resolving/MethodCallsWithLocalTypeReferences.java b/tests/org.emftext.language.java.test/src/test/resources/input/resolving/MethodCallsWithLocalTypeReferences.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/resolving/MethodCallsWithLocalTypeReferences.java rename to tests/org.emftext.language.java.test/src/test/resources/input/resolving/MethodCallsWithLocalTypeReferences.java diff --git a/tests/org.emftext.language.java.test/src-input/resolving/MethodCallsWithoutInheritance.java b/tests/org.emftext.language.java.test/src/test/resources/input/resolving/MethodCallsWithoutInheritance.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/resolving/MethodCallsWithoutInheritance.java rename to tests/org.emftext.language.java.test/src/test/resources/input/resolving/MethodCallsWithoutInheritance.java diff --git a/tests/org.emftext.language.java.test/src-input/resolving/ReferenceToInheritedMethod.java b/tests/org.emftext.language.java.test/src/test/resources/input/resolving/ReferenceToInheritedMethod.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/resolving/ReferenceToInheritedMethod.java rename to tests/org.emftext.language.java.test/src/test/resources/input/resolving/ReferenceToInheritedMethod.java diff --git a/tests/org.emftext.language.java.test/src-input/resolving/VariableReferencing.java b/tests/org.emftext.language.java.test/src/test/resources/input/resolving/VariableReferencing.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/resolving/VariableReferencing.java rename to tests/org.emftext.language.java.test/src/test/resources/input/resolving/VariableReferencing.java diff --git a/tests/org.emftext.language.java.test/src-input/resolving/importResolverTest/JavaUtilEnumerationImport.java b/tests/org.emftext.language.java.test/src/test/resources/input/resolving/importResolverTest/JavaUtilEnumerationImport.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/resolving/importResolverTest/JavaUtilEnumerationImport.java rename to tests/org.emftext.language.java.test/src/test/resources/input/resolving/importResolverTest/JavaUtilEnumerationImport.java diff --git a/tests/org.emftext.language.java.test/src-input/resolving_new/arrayParameters_2/AClass.java b/tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/arrayParameters_2/AClass.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/resolving_new/arrayParameters_2/AClass.java rename to tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/arrayParameters_2/AClass.java diff --git a/tests/org.emftext.language.java.test/src-input/resolving_new/autoboxingA_1/AClass.java b/tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/autoboxingA_1/AClass.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/resolving_new/autoboxingA_1/AClass.java rename to tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/autoboxingA_1/AClass.java diff --git a/tests/org.emftext.language.java.test/src-input/resolving_new/autoboxingB_1/AClass.java b/tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/autoboxingB_1/AClass.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/resolving_new/autoboxingB_1/AClass.java rename to tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/autoboxingB_1/AClass.java diff --git a/tests/org.emftext.language.java.test/src-input/resolving_new/fields_2/AClass.java b/tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/fields_2/AClass.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/resolving_new/fields_2/AClass.java rename to tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/fields_2/AClass.java diff --git a/tests/org.emftext.language.java.test/src-input/resolving_new/methodOverloading_2/MethodOverloading.java b/tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/methodOverloading_2/MethodOverloading.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/resolving_new/methodOverloading_2/MethodOverloading.java rename to tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/methodOverloading_2/MethodOverloading.java diff --git a/tests/org.emftext.language.java.test/src-input/resolving_new/methodParameters_4/LocalCalls.java b/tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/methodParameters_4/LocalCalls.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/resolving_new/methodParameters_4/LocalCalls.java rename to tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/methodParameters_4/LocalCalls.java diff --git a/tests/org.emftext.language.java.test/src-input/resolving_new/methods_1/Callee.java b/tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/methods_1/Callee.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/resolving_new/methods_1/Callee.java rename to tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/methods_1/Callee.java diff --git a/tests/org.emftext.language.java.test/src-input/resolving_new/methods_1/Caller.java b/tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/methods_1/Caller.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/resolving_new/methods_1/Caller.java rename to tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/methods_1/Caller.java diff --git a/tests/org.emftext.language.java.test/src-input/resolving_new/polymorphism_2/Caller.java b/tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/polymorphism_2/Caller.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/resolving_new/polymorphism_2/Caller.java rename to tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/polymorphism_2/Caller.java diff --git a/tests/org.emftext.language.java.test/src-input/resolving_new/polymorphism_2/SubClassA.java b/tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/polymorphism_2/SubClassA.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/resolving_new/polymorphism_2/SubClassA.java rename to tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/polymorphism_2/SubClassA.java diff --git a/tests/org.emftext.language.java.test/src-input/resolving_new/polymorphism_2/SubClassB.java b/tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/polymorphism_2/SubClassB.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/resolving_new/polymorphism_2/SubClassB.java rename to tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/polymorphism_2/SubClassB.java diff --git a/tests/org.emftext.language.java.test/src-input/resolving_new/polymorphism_2/SuperClass.java b/tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/polymorphism_2/SuperClass.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/resolving_new/polymorphism_2/SuperClass.java rename to tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/polymorphism_2/SuperClass.java diff --git a/tests/org.emftext.language.java.test/src-input/resolving_new/shadowedField_1/AClass.java b/tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/shadowedField_1/AClass.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/resolving_new/shadowedField_1/AClass.java rename to tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/shadowedField_1/AClass.java diff --git a/tests/org.emftext.language.java.test/src-input/resolving_new/staticImportA_2/Exporter.java b/tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/staticImportA_2/Exporter.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/resolving_new/staticImportA_2/Exporter.java rename to tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/staticImportA_2/Exporter.java diff --git a/tests/org.emftext.language.java.test/src-input/resolving_new/staticImportA_2/Importer.java b/tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/staticImportA_2/Importer.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/resolving_new/staticImportA_2/Importer.java rename to tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/staticImportA_2/Importer.java diff --git a/tests/org.emftext.language.java.test/src-input/resolving_new/staticImportB_2/Exporter.java b/tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/staticImportB_2/Exporter.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/resolving_new/staticImportB_2/Exporter.java rename to tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/staticImportB_2/Exporter.java diff --git a/tests/org.emftext.language.java.test/src-input/resolving_new/staticImportB_2/Importer.java b/tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/staticImportB_2/Importer.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/resolving_new/staticImportB_2/Importer.java rename to tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/staticImportB_2/Importer.java diff --git a/tests/org.emftext.language.java.test/src-input/resolving_new/superclassmethod_2/SubClass.java b/tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/superclassmethod_2/SubClass.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/resolving_new/superclassmethod_2/SubClass.java rename to tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/superclassmethod_2/SubClass.java diff --git a/tests/org.emftext.language.java.test/src-input/resolving_new/superclassmethod_2/SuperClass.java b/tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/superclassmethod_2/SuperClass.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/resolving_new/superclassmethod_2/SuperClass.java rename to tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/superclassmethod_2/SuperClass.java diff --git a/tests/org.emftext.language.java.test/src-input/resolving_new/typeArgumentsA_1/GenericClass.java b/tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/typeArgumentsA_1/GenericClass.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/resolving_new/typeArgumentsA_1/GenericClass.java rename to tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/typeArgumentsA_1/GenericClass.java diff --git a/tests/org.emftext.language.java.test/src-input/resolving_new/typeArgumentsA_1/SimpleClass.java b/tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/typeArgumentsA_1/SimpleClass.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/resolving_new/typeArgumentsA_1/SimpleClass.java rename to tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/typeArgumentsA_1/SimpleClass.java diff --git a/tests/org.emftext.language.java.test/src-input/resolving_new/typeparametersA_2/GenericClass.java b/tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/typeparametersA_2/GenericClass.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/resolving_new/typeparametersA_2/GenericClass.java rename to tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/typeparametersA_2/GenericClass.java diff --git a/tests/org.emftext.language.java.test/src-input/resolving_new/typeparametersB_1/Caller.java b/tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/typeparametersB_1/Caller.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/resolving_new/typeparametersB_1/Caller.java rename to tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/typeparametersB_1/Caller.java diff --git a/tests/org.emftext.language.java.test/src-input/resolving_new/typeparametersB_1/ClassA.java b/tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/typeparametersB_1/ClassA.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/resolving_new/typeparametersB_1/ClassA.java rename to tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/typeparametersB_1/ClassA.java diff --git a/tests/org.emftext.language.java.test/src-input/resolving_new/typeparametersB_1/GenericSuperClass.java b/tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/typeparametersB_1/GenericSuperClass.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/resolving_new/typeparametersB_1/GenericSuperClass.java rename to tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/typeparametersB_1/GenericSuperClass.java diff --git a/tests/org.emftext.language.java.test/src-input/resolving_new/typeparametersB_1/SubClass.java b/tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/typeparametersB_1/SubClass.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/resolving_new/typeparametersB_1/SubClass.java rename to tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/typeparametersB_1/SubClass.java diff --git a/tests/org.emftext.language.java.test/src-input/resolving_new/typeparametersC_0/Caller.java b/tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/typeparametersC_0/Caller.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/resolving_new/typeparametersC_0/Caller.java rename to tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/typeparametersC_0/Caller.java diff --git a/tests/org.emftext.language.java.test/src-input/resolving_new/typeparametersC_0/CollectionsSource.java b/tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/typeparametersC_0/CollectionsSource.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/resolving_new/typeparametersC_0/CollectionsSource.java rename to tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/typeparametersC_0/CollectionsSource.java diff --git a/tests/org.emftext.language.java.test/src-input/resolving_new/variableLengthParameters_2/AClass.java b/tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/variableLengthParameters_2/AClass.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/resolving_new/variableLengthParameters_2/AClass.java rename to tests/org.emftext.language.java.test/src/test/resources/input/resolving_new/variableLengthParameters_2/AClass.java diff --git a/tests/org.emftext.language.java.test/src-input/spechier/ClassC.java b/tests/org.emftext.language.java.test/src/test/resources/input/spechier/ClassC.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/spechier/ClassC.java rename to tests/org.emftext.language.java.test/src/test/resources/input/spechier/ClassC.java diff --git a/tests/org.emftext.language.java.test/src-input/spechier/SubClass.java b/tests/org.emftext.language.java.test/src/test/resources/input/spechier/SubClass.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/spechier/SubClass.java rename to tests/org.emftext.language.java.test/src/test/resources/input/spechier/SubClass.java diff --git a/tests/org.emftext.language.java.test/src-input/spechier/SuperClass.java b/tests/org.emftext.language.java.test/src/test/resources/input/spechier/SuperClass.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/spechier/SuperClass.java rename to tests/org.emftext.language.java.test/src/test/resources/input/spechier/SuperClass.java diff --git a/tests/org.emftext.language.java.test/src-input/staticcalltarget/CallTargetsProvider.java b/tests/org.emftext.language.java.test/src/test/resources/input/staticcalltarget/CallTargetsProvider.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/staticcalltarget/CallTargetsProvider.java rename to tests/org.emftext.language.java.test/src/test/resources/input/staticcalltarget/CallTargetsProvider.java diff --git a/tests/org.emftext.language.java.test/src-input/unicode/ControlZ.java b/tests/org.emftext.language.java.test/src/test/resources/input/unicode/ControlZ.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/unicode/ControlZ.java rename to tests/org.emftext.language.java.test/src/test/resources/input/unicode/ControlZ.java diff --git a/tests/org.emftext.language.java.test/src-input/unicode/MoreUnicodeCharacters.java b/tests/org.emftext.language.java.test/src/test/resources/input/unicode/MoreUnicodeCharacters.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/unicode/MoreUnicodeCharacters.java rename to tests/org.emftext.language.java.test/src/test/resources/input/unicode/MoreUnicodeCharacters.java diff --git a/tests/org.emftext.language.java.test/src-input/unicode/Unicode.java b/tests/org.emftext.language.java.test/src/test/resources/input/unicode/Unicode.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/unicode/Unicode.java rename to tests/org.emftext.language.java.test/src/test/resources/input/unicode/Unicode.java diff --git a/tests/org.emftext.language.java.test/src-input/unicode/UnicodeIdentifiers.java b/tests/org.emftext.language.java.test/src/test/resources/input/unicode/UnicodeIdentifiers.java similarity index 100% rename from tests/org.emftext.language.java.test/src-input/unicode/UnicodeIdentifiers.java rename to tests/org.emftext.language.java.test/src/test/resources/input/unicode/UnicodeIdentifiers.java diff --git a/tests/org.emftext.language.java.test/src-sevenandup/module-info.java b/tests/org.emftext.language.java.test/src/test/resources/sevenandup/module-info.java similarity index 100% rename from tests/org.emftext.language.java.test/src-sevenandup/module-info.java rename to tests/org.emftext.language.java.test/src/test/resources/sevenandup/module-info.java diff --git a/tests/org.emftext.language.java.test/src-sevenandup/pkg2/SimpleClassWithLambdaExpressions.java b/tests/org.emftext.language.java.test/src/test/resources/sevenandup/pkg2/SimpleClassWithLambdaExpressions.java similarity index 100% rename from tests/org.emftext.language.java.test/src-sevenandup/pkg2/SimpleClassWithLambdaExpressions.java rename to tests/org.emftext.language.java.test/src/test/resources/sevenandup/pkg2/SimpleClassWithLambdaExpressions.java diff --git a/tests/org.emftext.language.java.test/src-sevenandup/pkg2/SimpleClassWithLiterals.java b/tests/org.emftext.language.java.test/src/test/resources/sevenandup/pkg2/SimpleClassWithLiterals.java similarity index 100% rename from tests/org.emftext.language.java.test/src-sevenandup/pkg2/SimpleClassWithLiterals.java rename to tests/org.emftext.language.java.test/src/test/resources/sevenandup/pkg2/SimpleClassWithLiterals.java diff --git a/tests/org.emftext.language.java.test/src-sevenandup/pkg2/SimpleClassWithTryCatch.java b/tests/org.emftext.language.java.test/src/test/resources/sevenandup/pkg2/SimpleClassWithTryCatch.java similarity index 100% rename from tests/org.emftext.language.java.test/src-sevenandup/pkg2/SimpleClassWithTryCatch.java rename to tests/org.emftext.language.java.test/src/test/resources/sevenandup/pkg2/SimpleClassWithTryCatch.java diff --git a/tests/org.emftext.language.java.test/src-sevenandup/pkg2/SimpleInterfaceWithDefaultMethods.java b/tests/org.emftext.language.java.test/src/test/resources/sevenandup/pkg2/SimpleInterfaceWithDefaultMethods.java similarity index 100% rename from tests/org.emftext.language.java.test/src-sevenandup/pkg2/SimpleInterfaceWithDefaultMethods.java rename to tests/org.emftext.language.java.test/src/test/resources/sevenandup/pkg2/SimpleInterfaceWithDefaultMethods.java diff --git a/tests/org.emftext.language.java.test/src-sevenandup/pkgJava14/ClassWithMoreReferences.java b/tests/org.emftext.language.java.test/src/test/resources/sevenandup/pkgJava14/ClassWithMoreReferences.java similarity index 100% rename from tests/org.emftext.language.java.test/src-sevenandup/pkgJava14/ClassWithMoreReferences.java rename to tests/org.emftext.language.java.test/src/test/resources/sevenandup/pkgJava14/ClassWithMoreReferences.java diff --git a/tests/org.emftext.language.java.test/src-sevenandup/pkgJava14/ClassWithReferences.java b/tests/org.emftext.language.java.test/src/test/resources/sevenandup/pkgJava14/ClassWithReferences.java similarity index 100% rename from tests/org.emftext.language.java.test/src-sevenandup/pkgJava14/ClassWithReferences.java rename to tests/org.emftext.language.java.test/src/test/resources/sevenandup/pkgJava14/ClassWithReferences.java diff --git a/tests/org.emftext.language.java.test/src-sevenandup/pkgJava14/ClassWithReferences2.java b/tests/org.emftext.language.java.test/src/test/resources/sevenandup/pkgJava14/ClassWithReferences2.java similarity index 100% rename from tests/org.emftext.language.java.test/src-sevenandup/pkgJava14/ClassWithReferences2.java rename to tests/org.emftext.language.java.test/src/test/resources/sevenandup/pkgJava14/ClassWithReferences2.java diff --git a/tests/org.emftext.language.java.test/src-sevenandup/pkgJava14/ClassWithReferences3.java b/tests/org.emftext.language.java.test/src/test/resources/sevenandup/pkgJava14/ClassWithReferences3.java similarity index 100% rename from tests/org.emftext.language.java.test/src-sevenandup/pkgJava14/ClassWithReferences3.java rename to tests/org.emftext.language.java.test/src/test/resources/sevenandup/pkgJava14/ClassWithReferences3.java diff --git a/tests/org.emftext.language.java.test/src-sevenandup/pkgJava14/IntersectionTypeWithTypeArguments.java b/tests/org.emftext.language.java.test/src/test/resources/sevenandup/pkgJava14/IntersectionTypeWithTypeArguments.java similarity index 100% rename from tests/org.emftext.language.java.test/src-sevenandup/pkgJava14/IntersectionTypeWithTypeArguments.java rename to tests/org.emftext.language.java.test/src/test/resources/sevenandup/pkgJava14/IntersectionTypeWithTypeArguments.java diff --git a/tests/org.emftext.language.java.test/src-sevenandup/pkgJava14/SimpleClassWithSwitch.java b/tests/org.emftext.language.java.test/src/test/resources/sevenandup/pkgJava14/SimpleClassWithSwitch.java similarity index 100% rename from tests/org.emftext.language.java.test/src-sevenandup/pkgJava14/SimpleClassWithSwitch.java rename to tests/org.emftext.language.java.test/src/test/resources/sevenandup/pkgJava14/SimpleClassWithSwitch.java diff --git a/tests/org.emftext.language.java.test/src-sevenandup/simplepackage/SimpleClassWithDiamondTypeArguments.java b/tests/org.emftext.language.java.test/src/test/resources/sevenandup/simplepackage/SimpleClassWithDiamondTypeArguments.java similarity index 100% rename from tests/org.emftext.language.java.test/src-sevenandup/simplepackage/SimpleClassWithDiamondTypeArguments.java rename to tests/org.emftext.language.java.test/src/test/resources/sevenandup/simplepackage/SimpleClassWithDiamondTypeArguments.java diff --git a/tests/org.emftext.language.java.test/src-sevenandup/simplepackage/SimpleClassWithMethodReferenceExpressions.java b/tests/org.emftext.language.java.test/src/test/resources/sevenandup/simplepackage/SimpleClassWithMethodReferenceExpressions.java similarity index 100% rename from tests/org.emftext.language.java.test/src-sevenandup/simplepackage/SimpleClassWithMethodReferenceExpressions.java rename to tests/org.emftext.language.java.test/src/test/resources/sevenandup/simplepackage/SimpleClassWithMethodReferenceExpressions.java diff --git a/tests/org.emftext.language.java.test/src-sevenandup/simplepackage/SimpleClassWithReceiverParameters.java b/tests/org.emftext.language.java.test/src/test/resources/sevenandup/simplepackage/SimpleClassWithReceiverParameters.java similarity index 100% rename from tests/org.emftext.language.java.test/src-sevenandup/simplepackage/SimpleClassWithReceiverParameters.java rename to tests/org.emftext.language.java.test/src/test/resources/sevenandup/simplepackage/SimpleClassWithReceiverParameters.java diff --git a/tests/org.emftext.language.java.test/src-sevenandup/simplepackage/SimpleClassWithRestrictedKeywords.java b/tests/org.emftext.language.java.test/src/test/resources/sevenandup/simplepackage/SimpleClassWithRestrictedKeywords.java similarity index 100% rename from tests/org.emftext.language.java.test/src-sevenandup/simplepackage/SimpleClassWithRestrictedKeywords.java rename to tests/org.emftext.language.java.test/src/test/resources/sevenandup/simplepackage/SimpleClassWithRestrictedKeywords.java diff --git a/tests/org.emftext.language.java.test/src-sevenandup/simplepackage/SimpleClassWithVar.java b/tests/org.emftext.language.java.test/src/test/resources/sevenandup/simplepackage/SimpleClassWithVar.java similarity index 100% rename from tests/org.emftext.language.java.test/src-sevenandup/simplepackage/SimpleClassWithVar.java rename to tests/org.emftext.language.java.test/src/test/resources/sevenandup/simplepackage/SimpleClassWithVar.java diff --git a/tests/org.emftext.language.java.test/src-sevenandup/simplepackage/package-info.java b/tests/org.emftext.language.java.test/src/test/resources/sevenandup/simplepackage/package-info.java similarity index 100% rename from tests/org.emftext.language.java.test/src-sevenandup/simplepackage/package-info.java rename to tests/org.emftext.language.java.test/src/test/resources/sevenandup/simplepackage/package-info.java diff --git a/tests/org.emftext.language.java.test/src-standalone/DemoApplication.java b/tests/org.emftext.language.java.test/src/test/resources/standalone/DemoApplication.java similarity index 100% rename from tests/org.emftext.language.java.test/src-standalone/DemoApplication.java rename to tests/org.emftext.language.java.test/src/test/resources/standalone/DemoApplication.java diff --git a/tests/org.emftext.language.java.test/src-standalone/WelcomeController.java b/tests/org.emftext.language.java.test/src/test/resources/standalone/WelcomeController.java similarity index 100% rename from tests/org.emftext.language.java.test/src-standalone/WelcomeController.java rename to tests/org.emftext.language.java.test/src/test/resources/standalone/WelcomeController.java diff --git a/tests/org.emftext.language.java.test/JaMoPP-BulkTest b/tests/org.emftext.language.java.test/target/src-bulk/JaMoPP-BulkTest similarity index 100% rename from tests/org.emftext.language.java.test/JaMoPP-BulkTest rename to tests/org.emftext.language.java.test/target/src-bulk/JaMoPP-BulkTest diff --git a/tests/org.emftext.language.java.test/TeaStore b/tests/org.emftext.language.java.test/target/src-bulk/TeaStore similarity index 100% rename from tests/org.emftext.language.java.test/TeaStore rename to tests/org.emftext.language.java.test/target/src-bulk/TeaStore diff --git a/tests/org.emftext.language.java.test/acmeair b/tests/org.emftext.language.java.test/target/src-bulk/acmeair similarity index 100% rename from tests/org.emftext.language.java.test/acmeair rename to tests/org.emftext.language.java.test/target/src-bulk/acmeair diff --git a/tests/org.emftext.language.java.test/esda b/tests/org.emftext.language.java.test/target/src-bulk/esda similarity index 100% rename from tests/org.emftext.language.java.test/esda rename to tests/org.emftext.language.java.test/target/src-bulk/esda diff --git a/tests/org.emftext.language.java.test/microservice b/tests/org.emftext.language.java.test/target/src-bulk/microservice similarity index 100% rename from tests/org.emftext.language.java.test/microservice rename to tests/org.emftext.language.java.test/target/src-bulk/microservice diff --git a/tests/org.emftext.language.java.test/petclinic b/tests/org.emftext.language.java.test/target/src-bulk/petclinic similarity index 100% rename from tests/org.emftext.language.java.test/petclinic rename to tests/org.emftext.language.java.test/target/src-bulk/petclinic diff --git a/tests/org.emftext.language.java.test/piggymetrics b/tests/org.emftext.language.java.test/target/src-bulk/piggymetrics similarity index 100% rename from tests/org.emftext.language.java.test/piggymetrics rename to tests/org.emftext.language.java.test/target/src-bulk/piggymetrics diff --git a/tests/org.emftext.language.java.test/teammates b/tests/org.emftext.language.java.test/target/src-bulk/teammates similarity index 100% rename from tests/org.emftext.language.java.test/teammates rename to tests/org.emftext.language.java.test/target/src-bulk/teammates diff --git a/tests/pom.xml b/tests/pom.xml new file mode 100644 index 00000000..a1b9db9d --- /dev/null +++ b/tests/pom.xml @@ -0,0 +1,20 @@ + + + + 4.0.0 + jamopp.tests + pom + JaMoPP Tests + + + tools.mdsd + jamopp.parent + 6.0.0-SNAPSHOT + + + + org.emftext.language.java.test + +