aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Besedin2012-01-30 14:55:21 (EST)
committerOleg Besedin2012-01-30 14:55:21 (EST)
commitc16b5b5c925ca5d739df3f29ec134e8eb8f3d0b0 (patch)
tree030a2d718262c1db97dd10aedb5e57c3ddd3dc92
parent19a31be9a7ba95404466bbe425e7f4771f28d1ad (diff)
downloadeclipse.platform.runtime-c16b5b5c925ca5d739df3f29ec134e8eb8f3d0b0.zip
eclipse.platform.runtime-c16b5b5c925ca5d739df3f29ec134e8eb8f3d0b0.tar.gz
eclipse.platform.runtime-c16b5b5c925ca5d739df3f29ec134e8eb8f3d0b0.tar.bz2
Minor adjustmentsv20120130-1955
-rw-r--r--bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/ContextInjectionFactory.java4
-rw-r--r--bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/InjectorImpl.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/ContextInjectionFactory.java b/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/ContextInjectionFactory.java
index 1d22684..e29ab7f 100644
--- a/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/ContextInjectionFactory.java
+++ b/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/contexts/ContextInjectionFactory.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
+ * Copyright (c) 2009, 2012 IBM Corporation and others.
* 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
@@ -29,7 +29,7 @@ import org.eclipse.e4.core.internal.contexts.EclipseContext;
* <p>
* If annotations are supported by the runtime, matching of methods and fields to be injected is
* also performed using the annotations defined in packages javax.inject and
- * org.eclipse.e4.core.services.annotations.
+ * org.eclipse.e4.core.di.annotations.
* </p>
* <p>
* The injection of values is generally done as a number of calls. User objects that want to
diff --git a/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/InjectorImpl.java b/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/InjectorImpl.java
index e21bff2..a4371e6 100644
--- a/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/InjectorImpl.java
+++ b/bundles/org.eclipse.e4.core.di/src/org/eclipse/e4/core/internal/di/InjectorImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2011 IBM Corporation and others.
+ * Copyright (c) 2009, 2012 IBM Corporation and others.
* 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
@@ -666,7 +666,7 @@ public class InjectorImpl implements IInjector {
Class<?>[] methodParams = method.getParameterTypes();
int methodParamsLength = method.getParameterTypes().length;
for (Class<?> subClass : classHierarchy) {
- Method[] methods = subClass.getDeclaredMethods();
+ Method[] methods = getDeclaredMethods(subClass);
Method matchingMethod = null;
for (Method candidate : methods) {
if (!methodName.equals(candidate.getName()))