Skip to content

Commit b878685

Browse files
eclipse-platform-botakurtakov
eclipse-platform-bot
authored and
akurtakov
committed
Perform clean code of runtime/bundles/org.eclipse.e4.core.di.extensions.supplier
1 parent 61cd046 commit b878685

File tree

4 files changed

+71
-43
lines changed

4 files changed

+71
-43
lines changed

‎runtime/bundles/org.eclipse.e4.core.di.extensions.supplier/src/org/eclipse/e4/core/di/internal/extensions/EventObjectSupplier.java‎

Lines changed: 31 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -118,12 +118,15 @@ public IRequestor getRequestor() {
118118

119119
@Override
120120
public boolean equals(Object obj) {
121-
if (this == obj)
121+
if (this == obj) {
122122
return true;
123-
if (obj == null)
123+
}
124+
if (obj == null) {
124125
return false;
125-
if (getClass() != obj.getClass())
126+
}
127+
if (getClass() != obj.getClass()) {
126128
return false;
129+
}
127130
Subscriber other = (Subscriber) obj;
128131
return Objects.equals(this.requestor, other.requestor) && Objects.equals(this.topic, other.topic);
129132
}
@@ -146,38 +149,45 @@ protected void removeCurrentEvent(String topic) {
146149

147150
@Override
148151
public Object get(IObjectDescriptor descriptor, IRequestor requestor, boolean track, boolean group) {
149-
if (descriptor == null)
152+
if (descriptor == null) {
150153
return null;
154+
}
151155
String topic = getTopic(descriptor);
152-
if (topic == null || eventAdmin == null || topic.isEmpty())
156+
if (topic == null || eventAdmin == null || topic.isEmpty()) {
153157
return IInjector.NOT_A_VALUE;
158+
}
154159

155-
if (track)
160+
if (track) {
156161
subscribe(topic, requestor);
157-
else
162+
} else {
158163
unsubscribe(requestor);
164+
}
159165

160-
if (!currentEvents.containsKey(topic))
166+
if (!currentEvents.containsKey(topic)) {
161167
return IInjector.NOT_A_VALUE;
168+
}
162169

163170
// convert to fit destination
164171
Class<?> descriptorsClass = getDesiredClass(descriptor.getDesiredType());
165-
if (descriptorsClass.equals(Event.class))
172+
if (descriptorsClass.equals(Event.class)) {
166173
return currentEvents.get(topic);
174+
}
167175

168176
return currentEvents.get(topic).getProperty(DATA);
169177
}
170178

171179
private void subscribe(String topic, IRequestor requestor) {
172180
Subscriber subscriber = new Subscriber(requestor, topic);
173181
synchronized (registrations) {
174-
if (registrations.containsKey(subscriber))
182+
if (registrations.containsKey(subscriber)) {
175183
return;
184+
}
176185
}
177186
BundleContext bundleContext = FrameworkUtil.getBundle(EventObjectSupplier.class).getBundleContext();
178-
if (bundleContext == null)
187+
if (bundleContext == null) {
179188
throw new InjectionException(
180189
"Unable to subscribe to events: org.eclipse.e4.core.di.extensions bundle is not activated"); //$NON-NLS-1$
190+
}
181191

182192
String[] topics = new String[] { topic };
183193
Dictionary<String, Object> d = new Hashtable<>();
@@ -197,22 +207,25 @@ protected EventHandler makeHandler(String topic, IRequestor requestor) {
197207
}
198208

199209
protected String getTopic(IObjectDescriptor descriptor) {
200-
if (descriptor == null)
210+
if (descriptor == null) {
201211
return null;
212+
}
202213
EventTopic qualifier = descriptor.getQualifier(EventTopic.class);
203214
return qualifier.value();
204215
}
205216

206217
protected void unsubscribe(IRequestor requestor) {
207-
if (requestor == null)
218+
if (requestor == null) {
208219
return;
220+
}
209221
synchronized (registrations) {
210222
Iterator<Entry<Subscriber, ServiceRegistration<EventHandler>>> i = registrations.entrySet().iterator();
211223
while (i.hasNext()) {
212224
Entry<Subscriber, ServiceRegistration<EventHandler>> entry = i.next();
213225
Subscriber key = entry.getKey();
214-
if (!requestor.equals(key.getRequestor()))
226+
if (!requestor.equals(key.getRequestor())) {
215227
continue;
228+
}
216229
ServiceRegistration<EventHandler> registration = entry.getValue();
217230
registration.unregister();
218231
i.remove();
@@ -235,12 +248,14 @@ public void dispose() {
235248
}
236249

237250
private Class<?> getDesiredClass(Type desiredType) {
238-
if (desiredType instanceof Class<?>)
251+
if (desiredType instanceof Class<?>) {
239252
return (Class<?>) desiredType;
253+
}
240254
if (desiredType instanceof ParameterizedType) {
241255
Type rawType = ((ParameterizedType) desiredType).getRawType();
242-
if (rawType instanceof Class<?>)
256+
if (rawType instanceof Class<?>) {
243257
return (Class<?>) rawType;
258+
}
244259
}
245260
return null;
246261
}

‎runtime/bundles/org.eclipse.e4.core.di.extensions.supplier/src/org/eclipse/e4/core/di/internal/extensions/PreferencesObjectSupplier.java‎

Lines changed: 35 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -102,92 +102,104 @@ public void stopListening() {
102102

103103
@Override
104104
public Object get(IObjectDescriptor descriptor, IRequestor requestor, boolean track, boolean group) {
105-
if (descriptor == null)
105+
if (descriptor == null) {
106106
return null;
107+
}
107108
Class<?> descriptorsClass = getDesiredClass(descriptor.getDesiredType());
108109
String nodePath = getNodePath(descriptor, requestor.getRequestingObjectClass());
109110
if (IEclipsePreferences.class.equals(descriptorsClass)) {
110111
return InstanceScope.INSTANCE.getNode(nodePath);
111112
}
112113

113114
String key = getKey(descriptor);
114-
if (key == null || nodePath == null || key.isEmpty() || nodePath.isEmpty())
115+
if (key == null || nodePath == null || key.isEmpty() || nodePath.isEmpty()) {
115116
return IInjector.NOT_A_VALUE;
116-
if (track)
117+
}
118+
if (track) {
117119
addListener(nodePath, key, requestor);
120+
}
118121

119122
if (descriptorsClass.isPrimitive()) {
120-
if (descriptorsClass.equals(boolean.class))
123+
if (descriptorsClass.equals(boolean.class)) {
121124
return getPreferencesService().getBoolean(nodePath, key, false, null);
122-
else if (descriptorsClass.equals(int.class))
125+
} else if (descriptorsClass.equals(int.class)) {
123126
return getPreferencesService().getInt(nodePath, key, 0, null);
124-
else if (descriptorsClass.equals(double.class))
127+
} else if (descriptorsClass.equals(double.class)) {
125128
return getPreferencesService().getDouble(nodePath, key, 0.0d, null);
126-
else if (descriptorsClass.equals(float.class))
129+
} else if (descriptorsClass.equals(float.class)) {
127130
return getPreferencesService().getFloat(nodePath, key, 0.0f, null);
128-
else if (descriptorsClass.equals(long.class))
131+
} else if (descriptorsClass.equals(long.class)) {
129132
return getPreferencesService().getLong(nodePath, key, 0L, null);
133+
}
130134
}
131135

132-
if (String.class.equals(descriptorsClass))
136+
if (String.class.equals(descriptorsClass)) {
133137
return getPreferencesService().getString(nodePath, key, null, null);
134-
else if (Boolean.class.equals(descriptorsClass))
138+
} else if (Boolean.class.equals(descriptorsClass)) {
135139
return getPreferencesService().getBoolean(nodePath, key, false, null);
136-
else if (Integer.class.equals(descriptorsClass))
140+
} else if (Integer.class.equals(descriptorsClass)) {
137141
return getPreferencesService().getInt(nodePath, key, 0, null);
138-
else if (Double.class.equals(descriptorsClass))
142+
} else if (Double.class.equals(descriptorsClass)) {
139143
return getPreferencesService().getDouble(nodePath, key, 0.0d, null);
140-
else if (Float.class.equals(descriptorsClass))
144+
} else if (Float.class.equals(descriptorsClass)) {
141145
return getPreferencesService().getFloat(nodePath, key, 0.0f, null);
142-
else if (Long.class.equals(descriptorsClass))
146+
} else if (Long.class.equals(descriptorsClass)) {
143147
return getPreferencesService().getLong(nodePath, key, 0L, null);
148+
}
144149

145150
return getPreferencesService().getString(nodePath, key, null, null);
146151
}
147152

148153
private Class<?> getDesiredClass(Type desiredType) {
149-
if (desiredType instanceof Class<?>)
154+
if (desiredType instanceof Class<?>) {
150155
return (Class<?>) desiredType;
156+
}
151157
if (desiredType instanceof ParameterizedType) {
152158
Type rawType = ((ParameterizedType) desiredType).getRawType();
153-
if (rawType instanceof Class<?>)
159+
if (rawType instanceof Class<?>) {
154160
return (Class<?>) rawType;
161+
}
155162
}
156163
return null;
157164
}
158165

159166
private String getKey(IObjectDescriptor descriptor) {
160-
if (descriptor == null)
167+
if (descriptor == null) {
161168
return null;
169+
}
162170
Preference qualifier = descriptor.getQualifier(Preference.class);
163171
return qualifier.value();
164172
}
165173

166174
private String getNodePath(IObjectDescriptor descriptor, Class<?> requestingObject) {
167-
if (descriptor == null)
175+
if (descriptor == null) {
168176
return null;
177+
}
169178
Preference qualifier = descriptor.getQualifier(Preference.class);
170179
String nodePath = qualifier.nodePath();
171180

172181
if (nodePath == null || nodePath.isEmpty()) {
173-
if (requestingObject == null)
182+
if (requestingObject == null) {
174183
return null;
184+
}
175185
nodePath = FrameworkUtil.getBundle(requestingObject).getSymbolicName();
176186
}
177187
return nodePath;
178188
}
179189

180190
private void addListener(String nodePath, String key, final IRequestor requestor) {
181-
if (requestor == null)
191+
if (requestor == null) {
182192
return;
193+
}
183194
synchronized (listenerCache) {
184195
if (listenerCache.containsKey(nodePath)) {
185196
HashMap<String, List<PrefInjectionListener>> map = listenerCache.get(nodePath);
186197
if (map.containsKey(key)) {
187198
for (PrefInjectionListener listener : map.get(key)) {
188199
IRequestor previousRequestor = listener.getRequestor();
189-
if (previousRequestor.equals(requestor))
200+
if (previousRequestor.equals(requestor)) {
190201
return; // avoid adding duplicate listeners
202+
}
191203
}
192204
}
193205
}
@@ -216,8 +228,9 @@ public void removeAllListeners() {
216228
synchronized (listenerCache) {
217229
for (HashMap<String, List<PrefInjectionListener>> map : listenerCache.values()) {
218230
for (List<PrefInjectionListener> listeners : map.values()) {
219-
if (listeners == null)
231+
if (listeners == null) {
220232
continue;
233+
}
221234
for (PrefInjectionListener listener : listeners) {
222235
listener.stopListening();
223236
}

‎runtime/bundles/org.eclipse.e4.core.di.extensions.supplier/src/org/eclipse/e4/core/di/internal/extensions/ServiceSupplier.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,7 @@ public Object get(IObjectDescriptor descriptor, IRequestor requestor, boolean tr
124124
return IInjector.NOT_A_VALUE;
125125
}
126126
Service qualifier = descriptor.getQualifier(Service.class);
127-
if (desiredType instanceof ParameterizedType) {
128-
ParameterizedType t = (ParameterizedType) desiredType;
127+
if (desiredType instanceof ParameterizedType t) {
129128
if (t.getRawType() == Collections.class || t.getRawType() == List.class) {
130129
return handleCollection(supplierContext, t.getActualTypeArguments()[0], requestor,
131130
track && qualifier.dynamic(), qualifier);
@@ -137,7 +136,7 @@ public Object get(IObjectDescriptor descriptor, IRequestor requestor, boolean tr
137136

138137
private Object handleSingle(ServiceSupplierContext supplierContext, Type t, IRequestor requestor, boolean track,
139138
Service qualifier) {
140-
Class<?> cls = t instanceof ParameterizedType ? (Class<?>) ((ParameterizedType) t).getRawType() : (Class<?>) t;
139+
Class<?> cls = t instanceof ParameterizedType p ? (Class<?>) p.getRawType() : (Class<?>) t;
141140
try {
142141
Filter filter = supplierContext.getFilter(qualifier.filterExpression());
143142
ServiceSupplierTracker<?> tracker = supplierContext.getTracker(cls);
@@ -156,7 +155,7 @@ private Object handleSingle(ServiceSupplierContext supplierContext, Type t, IReq
156155

157156
private Object handleCollection(ServiceSupplierContext supplierContext, Type t, IRequestor requestor, boolean track,
158157
Service qualifier) {
159-
Class<?> cls = t instanceof ParameterizedType ? (Class<?>) ((ParameterizedType) t).getRawType() : (Class<?>) t;
158+
Class<?> cls = t instanceof ParameterizedType p ? (Class<?>) p.getRawType() : (Class<?>) t;
160159
try {
161160
Filter filter = supplierContext.getFilter(qualifier.filterExpression());
162161
ServiceSupplierTracker<?> tracker = supplierContext.getTracker(cls);

‎runtime/bundles/org.eclipse.e4.core.di.extensions.supplier/src/org/eclipse/e4/core/di/internal/extensions/util/EventUtils.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,9 @@ static public Event constructEvent(String topic, Object data) {
5555
} else {
5656
Dictionary<String, Object> d = new Hashtable<>(2);
5757
d.put(EventConstants.EVENT_TOPIC, topic);
58-
if (data != null)
58+
if (data != null) {
5959
d.put(DATA, data);
60+
}
6061
event = new Event(topic, d);
6162
}
6263
return event;

0 commit comments

Comments
 (0)