Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Komax codestyle override annotations #848

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 12 additions & 0 deletions ext/readline/src/main/java/org/jruby/JRubyApplet.java
Expand Up @@ -237,6 +237,7 @@ public void init() {
try { try {
final JRubyApplet applet = this; final JRubyApplet applet = this;
safeInvokeAndWait(new Runnable() { safeInvokeAndWait(new Runnable() {
@Override
public void run() { public void run() {
applet.setLayout(new BorderLayout()); applet.setLayout(new BorderLayout());
applet.facade.attach(applet.runtime, applet); applet.facade.attach(applet.runtime, applet);
Expand All @@ -261,6 +262,7 @@ private void invokeCallback(final RubyProc proc, final IRubyObject[] args) {
final Ruby ruby = this.runtime; final Ruby ruby = this.runtime;
try { try {
safeInvokeAndWait(new Runnable() { safeInvokeAndWait(new Runnable() {
@Override
public void run() { public void run() {
proc.call(ruby.getCurrentContext(), args); proc.call(ruby.getCurrentContext(), args);
} }
Expand Down Expand Up @@ -374,14 +376,19 @@ private synchronized void paintUnbuffered(Graphics g) {


private static class TrivialFacade implements Facade { private static class TrivialFacade implements Facade {
public TrivialFacade() {} public TrivialFacade() {}
@Override
public InputStream getInputStream() { return System.in; } public InputStream getInputStream() { return System.in; }
@Override
public PrintStream getOutputStream() { return System.out; } public PrintStream getOutputStream() { return System.out; }
@Override
public PrintStream getErrorStream() { return System.err; } public PrintStream getErrorStream() { return System.err; }
@Override
public void attach(Ruby runtime, Applet applet) { public void attach(Ruby runtime, Applet applet) {
final IRubyObject wrappedApplet = JavaEmbedUtils.javaToRuby(runtime, applet); final IRubyObject wrappedApplet = JavaEmbedUtils.javaToRuby(runtime, applet);
runtime.defineGlobalConstant("JRUBY_APPLET", wrappedApplet); runtime.defineGlobalConstant("JRUBY_APPLET", wrappedApplet);
wrappedApplet.getMetaClass().defineAnnotatedMethods(RubyMethods.class); wrappedApplet.getMetaClass().defineAnnotatedMethods(RubyMethods.class);
} }
@Override
public void destroy() {} public void destroy() {}
} }


Expand Down Expand Up @@ -416,16 +423,21 @@ public ConsoleFacade(String bannerText) {
errorStream = new PrintStream(adaptor.getOutputStream()); errorStream = new PrintStream(adaptor.getOutputStream());
} }


@Override
public InputStream getInputStream() { return inputStream; } public InputStream getInputStream() { return inputStream; }
@Override
public PrintStream getOutputStream() { return outputStream; } public PrintStream getOutputStream() { return outputStream; }
@Override
public PrintStream getErrorStream() { return errorStream; } public PrintStream getErrorStream() { return errorStream; }


@Override
public void attach(Ruby runtime, Applet applet) { public void attach(Ruby runtime, Applet applet) {
adaptor.hookIntoRuntime(runtime); adaptor.hookIntoRuntime(runtime);
applet.add(scrollPane); applet.add(scrollPane);
applet.validate(); applet.validate();
} }


@Override
public void destroy() { public void destroy() {
Container parent = scrollPane.getParent(); Container parent = scrollPane.getParent();
adaptor.shutdown(); adaptor.shutdown();
Expand Down
17 changes: 17 additions & 0 deletions src/org/jruby/BasicObjectStub.java
Expand Up @@ -332,42 +332,52 @@ public DummyInstanceVariables(IRubyObject nil) {
this.nil = nil; this.nil = nil;
} }


@Override
public boolean hasInstanceVariable(String name) { public boolean hasInstanceVariable(String name) {
return false; return false;
} }


@Override
public boolean fastHasInstanceVariable(String internedName) { public boolean fastHasInstanceVariable(String internedName) {
return false; return false;
} }


@Override
public IRubyObject getInstanceVariable(String name) { public IRubyObject getInstanceVariable(String name) {
return nil; return nil;
} }


@Override
public IRubyObject fastGetInstanceVariable(String internedName) { public IRubyObject fastGetInstanceVariable(String internedName) {
return nil; return nil;
} }


@Override
public IRubyObject setInstanceVariable(String name, IRubyObject value) { public IRubyObject setInstanceVariable(String name, IRubyObject value) {
return value; return value;
} }


@Override
public IRubyObject fastSetInstanceVariable(String internedName, IRubyObject value) { public IRubyObject fastSetInstanceVariable(String internedName, IRubyObject value) {
return value; return value;
} }


@Override
public IRubyObject removeInstanceVariable(String name) { public IRubyObject removeInstanceVariable(String name) {
return nil; return nil;
} }


@Override
public List<Variable<IRubyObject>> getInstanceVariableList() { public List<Variable<IRubyObject>> getInstanceVariableList() {
return Collections.EMPTY_LIST; return Collections.EMPTY_LIST;
} }


@Override
public List<String> getInstanceVariableNameList() { public List<String> getInstanceVariableNameList() {
return Collections.EMPTY_LIST; return Collections.EMPTY_LIST;
} }


@Override
public void copyInstanceVariablesInto(InstanceVariables other) { public void copyInstanceVariablesInto(InstanceVariables other) {
} }


Expand All @@ -380,28 +390,35 @@ public static InstanceVariables getInstanceVariables(IRubyObject self) {


@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
public static class DummyInternalVariables implements InternalVariables { public static class DummyInternalVariables implements InternalVariables {
@Override
public boolean hasInternalVariable(String name) { public boolean hasInternalVariable(String name) {
return false; return false;
} }


@Override
public boolean fastHasInternalVariable(String internedName) { public boolean fastHasInternalVariable(String internedName) {
return false; return false;
} }


@Override
public Object getInternalVariable(String name) { public Object getInternalVariable(String name) {
return null; return null;
} }


@Override
public Object fastGetInternalVariable(String internedName) { public Object fastGetInternalVariable(String internedName) {
return null; return null;
} }


@Override
public void setInternalVariable(String name, Object value) { public void setInternalVariable(String name, Object value) {
} }


@Override
public void fastSetInternalVariable(String internedName, Object value) { public void fastSetInternalVariable(String internedName, Object value) {
} }


@Override
public Object removeInternalVariable(String name) { public Object removeInternalVariable(String name) {
return null; return null;
} }
Expand Down
1 change: 1 addition & 0 deletions src/org/jruby/MetaClass.java
Expand Up @@ -46,6 +46,7 @@ public boolean isSingleton() {
return true; return true;
} }


@Override
public final IRubyObject allocate(){ public final IRubyObject allocate(){
throw runtime.newTypeError("can't create instance of virtual class"); throw runtime.newTypeError("can't create instance of virtual class");
} }
Expand Down
2 changes: 2 additions & 0 deletions src/org/jruby/NativeException.java
Expand Up @@ -59,6 +59,7 @@ private NativeException(Ruby runtime, RubyClass rubyClass) {
} }


private static ObjectAllocator NATIVE_EXCEPTION_ALLOCATOR = new ObjectAllocator() { private static ObjectAllocator NATIVE_EXCEPTION_ALLOCATOR = new ObjectAllocator() {
@Override
public IRubyObject allocate(Ruby runtime, RubyClass klazz) { public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
NativeException instance = new NativeException(runtime, klazz); NativeException instance = new NativeException(runtime, klazz);
instance.setMetaClass(klazz); instance.setMetaClass(klazz);
Expand All @@ -79,6 +80,7 @@ public IRubyObject cause(Block unusedBlock) {
return Java.getInstance(getRuntime(), cause); return Java.getInstance(getRuntime(), cause);
} }


@Override
public IRubyObject backtrace() { public IRubyObject backtrace() {
IRubyObject rubyTrace = super.backtrace(); IRubyObject rubyTrace = super.backtrace();
if (rubyTrace.isNil()) { if (rubyTrace.isNil()) {
Expand Down
1 change: 0 additions & 1 deletion src/org/jruby/ast/AndNode.java
Expand Up @@ -40,7 +40,6 @@
import org.jruby.runtime.Block; import org.jruby.runtime.Block;
import org.jruby.runtime.ThreadContext; import org.jruby.runtime.ThreadContext;
import org.jruby.runtime.builtin.IRubyObject; import org.jruby.runtime.builtin.IRubyObject;
import org.jruby.util.ByteList;
import org.jruby.util.DefinedMessage; import org.jruby.util.DefinedMessage;


/** /**
Expand Down
1 change: 1 addition & 0 deletions src/org/jruby/ast/ArgAuxillaryNode.java
Expand Up @@ -44,6 +44,7 @@ public ArgAuxillaryNode(ISourcePosition position, String name, int offset) {
this.offset = offset; this.offset = offset;
} }


@Override
public NodeType getNodeType() { public NodeType getNodeType() {
return NodeType.ARGAUXILIARYNODE; return NodeType.ARGAUXILIARYNODE;
} }
Expand Down
3 changes: 3 additions & 0 deletions src/org/jruby/ast/ArgumentNode.java
Expand Up @@ -55,10 +55,12 @@ public ArgumentNode(ISourcePosition position, String identifier, int location) {
this.location = location; // All variables should be depth 0 in this case this.location = location; // All variables should be depth 0 in this case
} }


@Override
public NodeType getNodeType() { public NodeType getNodeType() {
return NodeType.ARGUMENTNODE; return NodeType.ARGUMENTNODE;
} }


@Override
public Object accept(NodeVisitor visitor) { public Object accept(NodeVisitor visitor) {
return null; return null;
} }
Expand All @@ -82,6 +84,7 @@ public int getIndex() {
return location & 0xffff; return location & 0xffff;
} }


@Override
public String getName() { public String getName() {
return identifier; return identifier;
} }
Expand Down
3 changes: 2 additions & 1 deletion src/org/jruby/ast/Node.java
Expand Up @@ -46,7 +46,6 @@
import org.jruby.runtime.Block; import org.jruby.runtime.Block;
import org.jruby.runtime.ThreadContext; import org.jruby.runtime.ThreadContext;
import org.jruby.runtime.builtin.IRubyObject; import org.jruby.runtime.builtin.IRubyObject;
import org.jruby.util.ByteList;
import org.jruby.util.DefinedMessage; import org.jruby.util.DefinedMessage;


/** /**
Expand All @@ -66,10 +65,12 @@ public Node(ISourcePosition position) {
/** /**
* Location of this node within the source * Location of this node within the source
*/ */
@Override
public ISourcePosition getPosition() { public ISourcePosition getPosition() {
return position; return position;
} }


@Override
public void setPosition(ISourcePosition position) { public void setPosition(ISourcePosition position) {
this.position = position; this.position = position;
} }
Expand Down
1 change: 1 addition & 0 deletions src/org/jruby/ast/visitor/InstanceVariableFinder.java
Expand Up @@ -46,6 +46,7 @@ public static Set<String> findVariables(Node node) {
* *
* @return a Set of all instance variable names found * @return a Set of all instance variable names found
*/ */
@Override
public Set<String> getFoundVariables() { public Set<String> getFoundVariables() {
return foundVariables; return foundVariables;
} }
Expand Down