From 545642d2ebb975bc7144d6bd8115865e91d91ff1 Mon Sep 17 00:00:00 2001 From: Damien Date: Mon, 23 Sep 2013 09:44:51 +0200 Subject: [PATCH] Fix API properties loading. It failed to load the second Eclipse for test projects --- AndroidAnnotations/androidannotations-api/build.properties | 1 + .../java/org/androidannotations/AndroidAnnotationProcessor.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/AndroidAnnotations/androidannotations-api/build.properties b/AndroidAnnotations/androidannotations-api/build.properties index 9b70c8f64d..7156bf01b0 100644 --- a/AndroidAnnotations/androidannotations-api/build.properties +++ b/AndroidAnnotations/androidannotations-api/build.properties @@ -15,6 +15,7 @@ # source.. = src/main/java/,\ + src/main/resources/,\ src/test/java/,\ src/main/eclipse/ bin.includes = META-INF/,\ diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/AndroidAnnotationProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/AndroidAnnotationProcessor.java index 05dfacea79..5cdf4b1fb7 100644 --- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/AndroidAnnotationProcessor.java +++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/AndroidAnnotationProcessor.java @@ -354,7 +354,7 @@ private void loadPropertyFile() throws FileNotFoundException { private void loadApiPropertyFile() throws FileNotFoundException { String filename = "androidannotations-api.properties"; try { - URL url = getClass().getClassLoader().getResource(filename); + URL url = EActivity.class.getClassLoader().getResource(filename); propertiesApi.load(url.openStream()); } catch (Exception e) { throw new FileNotFoundException(filename + " couldn't be parsed. Please check your classpath and verify that AA-API's version is at least 3.0");