diff --git a/dexlib2/src/main/java/org/jf/dexlib2/iface/Annotation.java b/dexlib2/src/main/java/org/jf/dexlib2/iface/Annotation.java index 14638de0..a6cafddd 100644 --- a/dexlib2/src/main/java/org/jf/dexlib2/iface/Annotation.java +++ b/dexlib2/src/main/java/org/jf/dexlib2/iface/Annotation.java @@ -31,11 +31,16 @@ package org.jf.dexlib2.iface; -public interface Annotation extends BaseAnnotation { +import javax.annotation.Nonnull; +import java.util.List; + +public interface Annotation { // The possible annotation visibility values public static final int BUILD = 0; public static final int RUNTIME = 1; public static final int SYSTEM = 2; int getVisibility(); + @Nonnull String getType(); + @Nonnull List getElements(); } diff --git a/dexlib2/src/main/java/org/jf/dexlib2/iface/BaseAnnotation.java b/dexlib2/src/main/java/org/jf/dexlib2/iface/BaseAnnotation.java deleted file mode 100644 index 96411f6d..00000000 --- a/dexlib2/src/main/java/org/jf/dexlib2/iface/BaseAnnotation.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2012, Google Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Google Inc. nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -package org.jf.dexlib2.iface; - -import javax.annotation.Nonnull; -import java.util.List; - -public interface BaseAnnotation { - @Nonnull String getType(); - @Nonnull List getElements(); -} diff --git a/dexlib2/src/main/java/org/jf/dexlib2/iface/value/AnnotationEncodedValue.java b/dexlib2/src/main/java/org/jf/dexlib2/iface/value/AnnotationEncodedValue.java index 7148393c..fb027a34 100644 --- a/dexlib2/src/main/java/org/jf/dexlib2/iface/value/AnnotationEncodedValue.java +++ b/dexlib2/src/main/java/org/jf/dexlib2/iface/value/AnnotationEncodedValue.java @@ -31,7 +31,12 @@ package org.jf.dexlib2.iface.value; -import org.jf.dexlib2.iface.BaseAnnotation; +import org.jf.dexlib2.iface.AnnotationElement; -public interface AnnotationEncodedValue extends EncodedValue, BaseAnnotation { +import javax.annotation.Nonnull; +import java.util.List; + +public interface AnnotationEncodedValue extends EncodedValue { + @Nonnull String getType(); + @Nonnull List getElements(); } diff --git a/dexlib2/src/main/java/org/jf/dexlib2/immutable/ImmutableBaseAnnotation.java b/dexlib2/src/main/java/org/jf/dexlib2/immutable/ImmutableBaseAnnotation.java deleted file mode 100644 index 5af4e1df..00000000 --- a/dexlib2/src/main/java/org/jf/dexlib2/immutable/ImmutableBaseAnnotation.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright 2012, Google Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Google Inc. nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -package org.jf.dexlib2.immutable; - -import com.google.common.collect.ImmutableList; -import org.jf.dexlib2.iface.AnnotationElement; -import org.jf.dexlib2.iface.BaseAnnotation; -import org.jf.util.ImmutableListUtils; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import java.util.List; - -public class ImmutableBaseAnnotation implements BaseAnnotation { - @Nonnull public final String type; - @Nonnull public final ImmutableList elements; - - public ImmutableBaseAnnotation(@Nonnull String type, - @Nullable List elements) { - this.type = type; - this.elements = ImmutableAnnotationElement.immutableListOf(elements); - } - - public ImmutableBaseAnnotation(@Nonnull String type, - @Nullable ImmutableList elements) { - this.type = type; - this.elements = ImmutableListUtils.nullToEmptyList(elements); - } - - public static ImmutableBaseAnnotation of(BaseAnnotation baseAnnotation) { - if (baseAnnotation instanceof ImmutableBaseAnnotation) { - return (ImmutableBaseAnnotation)baseAnnotation; - } - return new ImmutableBaseAnnotation( - baseAnnotation.getType(), - baseAnnotation.getElements()); - } - - @Nonnull @Override public String getType() { return type; } - @Nonnull @Override public ImmutableList getElements() { return elements; } -}