Bug 304437 - [EAS] preferences
diff --git a/bundles/org.eclipse.e4.core.di.extensions/OSGI-INF/preferences.xml b/bundles/org.eclipse.e4.core.di.extensions/OSGI-INF/preferences.xml index 1171d30..6e40e15 100644 --- a/bundles/org.eclipse.e4.core.di.extensions/OSGI-INF/preferences.xml +++ b/bundles/org.eclipse.e4.core.di.extensions/OSGI-INF/preferences.xml
@@ -4,5 +4,5 @@ <service> <provide interface="org.eclipse.e4.core.di.suppliers.ExtendedObjectSupplier"/> </service> - <property name="dependency.injection.annotation" type="String" value="org.eclipse.e4.core.di.extensions.Preferences"/> + <property name="dependency.injection.annotation" type="String" value="org.eclipse.e4.core.di.extensions.Preference"/> </scr:component>
diff --git a/bundles/org.eclipse.e4.core.di.extensions/src/org/eclipse/e4/core/di/extensions/Preferences.java b/bundles/org.eclipse.e4.core.di.extensions/src/org/eclipse/e4/core/di/extensions/Preference.java similarity index 91% rename from bundles/org.eclipse.e4.core.di.extensions/src/org/eclipse/e4/core/di/extensions/Preferences.java rename to bundles/org.eclipse.e4.core.di.extensions/src/org/eclipse/e4/core/di/extensions/Preference.java index f49ee2f..4ecd8c9 100644 --- a/bundles/org.eclipse.e4.core.di.extensions/src/org/eclipse/e4/core/di/extensions/Preferences.java +++ b/bundles/org.eclipse.e4.core.di.extensions/src/org/eclipse/e4/core/di/extensions/Preference.java
@@ -22,9 +22,9 @@ */ @Qualifier @Documented -@Target({ ElementType.FIELD, ElementType.PARAMETER }) +@Target({ElementType.FIELD, ElementType.PARAMETER}) @Retention(RetentionPolicy.RUNTIME) -public @interface Preferences { +public @interface Preference { String value() default ""; // key in the node String nodePath() default "";
diff --git a/bundles/org.eclipse.e4.core.di.extensions/src/org/eclipse/e4/core/di/internal/extensions/PreferencesObjectSupplier.java b/bundles/org.eclipse.e4.core.di.extensions/src/org/eclipse/e4/core/di/internal/extensions/PreferencesObjectSupplier.java index 5bcd815..68f8615 100644 --- a/bundles/org.eclipse.e4.core.di.extensions/src/org/eclipse/e4/core/di/internal/extensions/PreferencesObjectSupplier.java +++ b/bundles/org.eclipse.e4.core.di.extensions/src/org/eclipse/e4/core/di/internal/extensions/PreferencesObjectSupplier.java
@@ -20,7 +20,7 @@ import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener; import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent; import org.eclipse.e4.core.di.IInjector; -import org.eclipse.e4.core.di.extensions.Preferences; +import org.eclipse.e4.core.di.extensions.Preference; import org.eclipse.e4.core.di.suppliers.ExtendedObjectSupplier; import org.eclipse.e4.core.di.suppliers.IObjectDescriptor; import org.eclipse.e4.core.di.suppliers.IRequestor; @@ -53,14 +53,14 @@ private String getKey(IObjectDescriptor descriptor) { if (descriptor == null) return null; - Preferences qualifier = descriptor.getQualifier(Preferences.class); + Preference qualifier = descriptor.getQualifier(Preference.class); return qualifier.value(); } private String getNodePath(IObjectDescriptor descriptor, Object requestingObject) { if (descriptor == null) return null; - Preferences qualifier = descriptor.getQualifier(Preferences.class); + Preference qualifier = descriptor.getQualifier(Preference.class); String nodePath = qualifier.nodePath(); if (nodePath == null || nodePath.length() == 0) {
diff --git a/tests/org.eclipse.e4.core.tests/src/org/eclipse/e4/core/internal/tests/di/extensions/InjectionMixedSuppliersTest.java b/tests/org.eclipse.e4.core.tests/src/org/eclipse/e4/core/internal/tests/di/extensions/InjectionMixedSuppliersTest.java index 063ef6b..8c9149c 100644 --- a/tests/org.eclipse.e4.core.tests/src/org/eclipse/e4/core/internal/tests/di/extensions/InjectionMixedSuppliersTest.java +++ b/tests/org.eclipse.e4.core.tests/src/org/eclipse/e4/core/internal/tests/di/extensions/InjectionMixedSuppliersTest.java
@@ -22,7 +22,7 @@ import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.core.contexts.EclipseContextFactory; import org.eclipse.e4.core.contexts.IEclipseContext; -import org.eclipse.e4.core.di.extensions.Preferences; +import org.eclipse.e4.core.di.extensions.Preference; import org.eclipse.e4.core.internal.tests.CoreTestsActivator; import org.osgi.service.prefs.BackingStoreException; @@ -33,7 +33,7 @@ public String other; @Inject - public void setPrefs(@Named("testMixed") String otherString, @Preferences("injectedPrefs") String string) { + public void setPrefs(@Named("testMixed") String otherString, @Preference("injectedPrefs") String string) { pref = string; other = otherString; }
diff --git a/tests/org.eclipse.e4.core.tests/src/org/eclipse/e4/core/internal/tests/di/extensions/InjectionPreferencesTest.java b/tests/org.eclipse.e4.core.tests/src/org/eclipse/e4/core/internal/tests/di/extensions/InjectionPreferencesTest.java index 90d4b2b..8184bea 100644 --- a/tests/org.eclipse.e4.core.tests/src/org/eclipse/e4/core/internal/tests/di/extensions/InjectionPreferencesTest.java +++ b/tests/org.eclipse.e4.core.tests/src/org/eclipse/e4/core/internal/tests/di/extensions/InjectionPreferencesTest.java
@@ -22,7 +22,7 @@ import org.eclipse.e4.core.contexts.EclipseContextFactory; import org.eclipse.e4.core.contexts.IEclipseContext; import org.eclipse.e4.core.di.annotations.Optional; -import org.eclipse.e4.core.di.extensions.Preferences; +import org.eclipse.e4.core.di.extensions.Preference; import org.eclipse.e4.core.internal.tests.CoreTestsActivator; import org.osgi.service.prefs.BackingStoreException; @@ -43,19 +43,19 @@ public String prefOptional2; @Inject - public void setPrefs(@Preferences(TEST_PREFS_KEY) String string) { + public void setPrefs(@Preference(TEST_PREFS_KEY) String string) { counter++; pref = string; } @Inject - public void setPrefsNode(@Preferences(value=TEST_PREFS_KEY, nodePath=TEST_PREFS_NODE) String string) { + public void setPrefsNode(@Preference(value=TEST_PREFS_KEY, nodePath=TEST_PREFS_NODE) String string) { counterNode++; prefNode = string; } @Inject - public void setOptionalPrefs(@Optional @Preferences("something") String string1, @Preferences(TEST_PREFS_KEY) String string2) { + public void setOptionalPrefs(@Optional @Preference("something") String string1, @Preference(TEST_PREFS_KEY) String string2) { counterOptional++; prefOptional1 = string1; prefOptional2 = string2;