Skip to content

Commit f41e00d

Browse files
eclipse-platform-botakurtakov
eclipse-platform-bot
authored and
akurtakov
committed
Perform clean code of runtime/bundles/org.eclipse.core.runtime
1 parent 43c562f commit f41e00d

File tree

10 files changed

+234
-128
lines changed

10 files changed

+234
-128
lines changed

‎runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/preferences/legacy/InitLegacyPreferences.java‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,32 +44,36 @@ public class InitLegacyPreferences implements ILegacyPreferences {
4444
@Deprecated
4545
public Object init(Object object, String name) {
4646
Plugin plugin = null;
47-
if (object instanceof Plugin)
47+
if (object instanceof Plugin) {
4848
plugin = (Plugin) object;
49-
else {
49+
} else {
5050
plugin = getActivator(name);
5151
if (plugin == null) {
52-
if (InternalPlatform.DEBUG_PLUGIN_PREFERENCES)
52+
if (InternalPlatform.DEBUG_PLUGIN_PREFERENCES) {
5353
InternalPlatform.message("No plug-in object available to set plug-in default preference overrides for:" + name); //$NON-NLS-1$
54+
}
5455
return null;
5556
}
5657
}
5758

58-
if (InternalPlatform.DEBUG_PLUGIN_PREFERENCES)
59+
if (InternalPlatform.DEBUG_PLUGIN_PREFERENCES) {
5960
InternalPlatform.message("Applying plug-in default preference overrides for plug-in: " + plugin.getBundle().getBundleId()); //$NON-NLS-1$
61+
}
6062

6163
plugin.internalInitializeDefaultPluginPreferences();
6264
return plugin;
6365
}
6466

6567
private Plugin getActivator(String name) {
6668
Bundle bundle = InternalPlatform.getDefault().getBundle(name);
67-
if (bundle == null)
69+
if (bundle == null) {
6870
return null;
71+
}
6972

7073
BundleContext context = bundle.getBundleContext();
71-
if (context == null)
74+
if (context == null) {
7275
return null;
76+
}
7377

7478
/*
7579
* Reflection is required since there is no OSGi API to retrieve the
@@ -80,8 +84,9 @@ private Plugin getActivator(String name) {
8084
Field field = context.getClass().getDeclaredField("activator"); //$NON-NLS-1$
8185
field.setAccessible(true);
8286
Object activator = field.get(context);
83-
if (activator instanceof Plugin)
87+
if (activator instanceof Plugin) {
8488
return (Plugin) activator;
89+
}
8590
} catch (SecurityException | NoSuchFieldException | IllegalArgumentException | IllegalAccessException ex) {
8691
log(ex, name);
8792
}

‎runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/preferences/legacy/PreferenceForwarder.java‎

Lines changed: 72 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -106,22 +106,25 @@ public synchronized void addPropertyChangeListener(IPropertyChangeListener liste
106106
@Override
107107
public void preferenceChange(IEclipsePreferences.PreferenceChangeEvent event) {
108108
// if we are the ones making this change, then don't broadcast
109-
if (!notify)
109+
if (!notify) {
110110
return;
111+
}
111112
Object oldValue = event.getOldValue();
112113
Object newValue = event.getNewValue();
113114
String key = event.getKey();
114-
if (newValue == null)
115+
if (newValue == null) {
115116
newValue = getDefault(key, oldValue);
116-
else if (oldValue == null)
117+
} else if (oldValue == null) {
117118
oldValue = getDefault(key, newValue);
119+
}
118120
firePropertyChangeEvent(key, oldValue, newValue);
119121
}
120122

121123
private EclipsePreferences getPluginPreferences(boolean create) {
122124
try {
123-
if (!create && !pluginRoot.nodeExists(pluginID))
125+
if (!create && !pluginRoot.nodeExists(pluginID)) {
124126
return null;
127+
}
125128
} catch (BackingStoreException e) {
126129
return null;
127130
}
@@ -163,22 +166,23 @@ public synchronized void removePropertyChangeListener(IPropertyChangeListener li
163166
*/
164167
private Object getDefault(String key, Object obj) {
165168
IEclipsePreferences defaults = getDefaultPreferences();
166-
if (obj instanceof String)
169+
if (obj instanceof String) {
167170
return defaults.get(key, STRING_DEFAULT_DEFAULT);
168-
else if (obj instanceof Integer)
171+
} else if (obj instanceof Integer) {
169172
return Integer.valueOf(defaults.getInt(key, INT_DEFAULT_DEFAULT));
170-
else if (obj instanceof Double)
173+
} else if (obj instanceof Double) {
171174
return Double.valueOf(defaults.getDouble(key, DOUBLE_DEFAULT_DEFAULT));
172-
else if (obj instanceof Float)
175+
} else if (obj instanceof Float) {
173176
return Float.valueOf(defaults.getFloat(key, FLOAT_DEFAULT_DEFAULT));
174-
else if (obj instanceof Long)
177+
} else if (obj instanceof Long) {
175178
return Long.valueOf(defaults.getLong(key, LONG_DEFAULT_DEFAULT));
176-
else if (obj instanceof byte[])
179+
} else if (obj instanceof byte[]) {
177180
return defaults.getByteArray(key, BYTE_ARRAY_DEFAULT_DEFAULT);
178-
else if (obj instanceof Boolean)
181+
} else if (obj instanceof Boolean) {
179182
return defaults.getBoolean(key, BOOLEAN_DEFAULT_DEFAULT) ? Boolean.TRUE : Boolean.FALSE;
180-
else
183+
} else {
181184
return null;
185+
}
182186
}
183187

184188
/**
@@ -192,11 +196,13 @@ else if (obj instanceof Boolean)
192196
*/
193197
@Override
194198
public boolean contains(String name) {
195-
if (name == null)
199+
if (name == null) {
196200
return false;
201+
}
197202
String value = getPluginPreferences(true).get(name, null);
198-
if (value != null)
203+
if (value != null) {
199204
return true;
205+
}
200206
return getDefaultPreferences().get(name, null) != null;
201207
}
202208

@@ -238,14 +244,16 @@ public boolean getBoolean(String name) {
238244
public void setValue(String name, boolean value) {
239245
Boolean oldValue = getBoolean(name) ? Boolean.TRUE : Boolean.FALSE;
240246
Boolean newValue = value ? Boolean.TRUE : Boolean.FALSE;
241-
if (newValue == oldValue)
247+
if (newValue == oldValue) {
242248
return;
249+
}
243250
try {
244251
notify = false;
245-
if (getDefaultBoolean(name) == value)
252+
if (getDefaultBoolean(name) == value) {
246253
getPluginPreferences(true).remove(name);
247-
else
254+
} else {
248255
getPluginPreferences(true).putBoolean(name, value);
256+
}
249257
firePropertyChangeEvent(name, oldValue, newValue);
250258
} finally {
251259
notify = true;
@@ -324,19 +332,22 @@ public double getDouble(String name) {
324332
*/
325333
@Override
326334
public void setValue(String name, double value) {
327-
if (Double.isNaN(value))
335+
if (Double.isNaN(value)) {
328336
throw new IllegalArgumentException();
337+
}
329338
final double doubleValue = getDouble(name);
330-
if (value == doubleValue)
339+
if (value == doubleValue) {
331340
return;
341+
}
332342
Double oldValue = Double.valueOf(doubleValue);
333343
Double newValue = Double.valueOf(value);
334344
try {
335345
notify = false;
336-
if (getDefaultDouble(name) == value)
346+
if (getDefaultDouble(name) == value) {
337347
getPluginPreferences(true).remove(name);
338-
else
348+
} else {
339349
getPluginPreferences(true).putDouble(name, value);
350+
}
340351
firePropertyChangeEvent(name, oldValue, newValue);
341352
} finally {
342353
notify = true;
@@ -376,8 +387,9 @@ public double getDefaultDouble(String name) {
376387
*/
377388
@Override
378389
public void setDefault(String name, double value) {
379-
if (Double.isNaN(value))
390+
if (Double.isNaN(value)) {
380391
throw new IllegalArgumentException();
392+
}
381393
getDefaultPreferences().putDouble(name, value);
382394
}
383395

@@ -418,19 +430,22 @@ public float getFloat(String name) {
418430
*/
419431
@Override
420432
public void setValue(String name, float value) {
421-
if (Float.isNaN(value))
433+
if (Float.isNaN(value)) {
422434
throw new IllegalArgumentException();
435+
}
423436
final float floatValue = getFloat(name);
424-
if (value == floatValue)
437+
if (value == floatValue) {
425438
return;
439+
}
426440
Float oldValue = Float.valueOf(floatValue);
427441
Float newValue = Float.valueOf(value);
428442
try {
429443
notify = false;
430-
if (getDefaultFloat(name) == value)
444+
if (getDefaultFloat(name) == value) {
431445
getPluginPreferences(true).remove(name);
432-
else
446+
} else {
433447
getPluginPreferences(true).putFloat(name, value);
448+
}
434449
firePropertyChangeEvent(name, oldValue, newValue);
435450
} finally {
436451
notify = true;
@@ -470,8 +485,9 @@ public float getDefaultFloat(String name) {
470485
*/
471486
@Override
472487
public void setDefault(String name, float value) {
473-
if (Float.isNaN(value))
488+
if (Float.isNaN(value)) {
474489
throw new IllegalArgumentException();
490+
}
475491
getDefaultPreferences().putFloat(name, value);
476492
}
477493

@@ -512,16 +528,18 @@ public int getInt(String name) {
512528
@Override
513529
public void setValue(String name, int value) {
514530
final int intValue = getInt(name);
515-
if (value == intValue)
531+
if (value == intValue) {
516532
return;
533+
}
517534
Integer oldValue = Integer.valueOf(intValue);
518535
Integer newValue = Integer.valueOf(value);
519536
try {
520537
notify = false;
521-
if (getDefaultInt(name) == value)
538+
if (getDefaultInt(name) == value) {
522539
getPluginPreferences(true).remove(name);
523-
else
540+
} else {
524541
getPluginPreferences(true).putInt(name, value);
542+
}
525543
firePropertyChangeEvent(name, oldValue, newValue);
526544
} finally {
527545
notify = true;
@@ -600,16 +618,18 @@ public long getLong(String name) {
600618
@Override
601619
public void setValue(String name, long value) {
602620
final long longValue = getLong(name);
603-
if (value == longValue)
621+
if (value == longValue) {
604622
return;
623+
}
605624
Long oldValue = Long.valueOf(longValue);
606625
Long newValue = Long.valueOf(value);
607626
try {
608627
notify = false;
609-
if (getDefaultLong(name) == value)
628+
if (getDefaultLong(name) == value) {
610629
getPluginPreferences(true).remove(name);
611-
else
630+
} else {
612631
getPluginPreferences(true).putLong(name, value);
632+
}
613633
firePropertyChangeEvent(name, oldValue, newValue);
614634
} finally {
615635
notify = true;
@@ -686,17 +706,20 @@ public String getString(String name) {
686706
*/
687707
@Override
688708
public void setValue(String name, String value) {
689-
if (value == null)
709+
if (value == null) {
690710
throw new IllegalArgumentException();
711+
}
691712
String oldValue = getString(name);
692-
if (value.equals(oldValue))
713+
if (value.equals(oldValue)) {
693714
return;
715+
}
694716
try {
695717
notify = false;
696-
if (getDefaultString(name).equals(value))
718+
if (getDefaultString(name).equals(value)) {
697719
getPluginPreferences(true).remove(name);
698-
else
720+
} else {
699721
getPluginPreferences(true).put(name, value);
722+
}
700723
firePropertyChangeEvent(name, oldValue, value);
701724
} finally {
702725
notify = true;
@@ -735,8 +758,9 @@ public String getDefaultString(String name) {
735758
*/
736759
@Override
737760
public void setDefault(String name, String value) {
738-
if (value == null)
761+
if (value == null) {
739762
throw new IllegalArgumentException();
763+
}
740764
getDefaultPreferences().put(name, value);
741765
}
742766

@@ -751,8 +775,9 @@ public void setDefault(String name, String value) {
751775
*/
752776
@Override
753777
public boolean isDefault(String name) {
754-
if (name == null)
778+
if (name == null) {
755779
return false;
780+
}
756781
return getPluginPreferences(true).get(name, null) == null;
757782
}
758783

@@ -779,8 +804,9 @@ public boolean isDefault(String name) {
779804
public void setToDefault(String name) {
780805
IEclipsePreferences preferences = getPluginPreferences(true);
781806
Object oldValue = preferences.get(name, null);
782-
if (oldValue != null)
807+
if (oldValue != null) {
783808
preferences.remove(name);
809+
}
784810
}
785811

786812
/**
@@ -828,8 +854,9 @@ public boolean needsSaving() {
828854
*/
829855
public void flush() throws BackingStoreException {
830856
IEclipsePreferences node = getPluginPreferences(false);
831-
if (node != null)
857+
if (node != null) {
832858
node.flush();
859+
}
833860
}
834861

835862
/*
@@ -880,8 +907,9 @@ private void convertFromProperties(Properties props) {
880907
for (Object object : props.keySet()) {
881908
String key = (String) object;
882909
String value = props.getProperty(key);
883-
if (value != null)
910+
if (value != null) {
884911
preferences.put(key, value);
912+
}
885913
}
886914
}
887915

@@ -899,8 +927,9 @@ private Properties convertToProperties() {
899927
String[] keys = propertyNames();
900928
for (String key : keys) {
901929
String value = getString(key);
902-
if (!Preferences.STRING_DEFAULT_DEFAULT.equals(value))
930+
if (!Preferences.STRING_DEFAULT_DEFAULT.equals(value)) {
903931
result.put(key, value);
932+
}
904933
}
905934
return result;
906935
}

0 commit comments

Comments
 (0)