a few whitespace and coding convention changes

Change-Id: I29bdabb56323a05cc5c2eabc55174cc774b11c9e
This commit is contained in:
Axel Uhl
2016-06-06 09:44:50 +02:00
parent b37f28ef33
commit d6537007ee
3 changed files with 10 additions and 6 deletions
@@ -16,7 +16,8 @@ import com.sap.sse.gwt.client.shared.components.CompositeSettings;
* @author Frank Mittag
*
* @param <PS>
* the {@link Perspective} settings type
* the {@link Perspective}'s own settings type; those could, e.g., hold settings such as how much space
* is assigned to which component, or how the perspective displays itself, such as embedded or not
*/
public class PerspectiveCompositeSettings<PS extends Settings> extends CompositeSettings {
private final PS perspectiveOwnSettings;
@@ -92,7 +92,7 @@ public class PerspectiveCompositeTabbedSettingsDialogComponent<PS extends Settin
public PerspectiveCompositeTabbedSettingsDialogComponent(PerspectiveLifecycleWithAllSettings<?, PS> perspectiveLifecycleWithAllSettings) {
this.componentIdsAndDialogComponents = new ArrayList<>();
CompositeSettings componentSettings = perspectiveLifecycleWithAllSettings.getComponentSettings();
for(ComponentLifecycle<?,?> componentLifecycle: perspectiveLifecycleWithAllSettings.getPerspectiveLifecycle().getComponentLifecycles()) {
for (ComponentLifecycle<?,?> componentLifecycle: perspectiveLifecycleWithAllSettings.getPerspectiveLifecycle().getComponentLifecycles()) {
if (componentLifecycle.hasSettings()) {
ComponentIdAndSettings<?> settingsOfComponent = componentSettings.findComponentAndSettingsByLifecycle(componentLifecycle);
this.componentIdsAndDialogComponents.add(createComponentIdAndDialogComponent(componentLifecycle, settingsOfComponent));
@@ -45,10 +45,13 @@ public class PerspectiveLifecycleWithAllSettings<PL extends PerspectiveLifecycle
}
public <C extends ComponentLifecycle<S,?> ,S extends Settings> S findComponentSettingsByLifecycle(C componentLifecycle) {
ComponentIdAndSettings<S> componentAndSettings = allSettings.findComponentAndSettingsByLifecycle(componentLifecycle);
if(componentAndSettings != null) {
return componentAndSettings.getSettings();
final ComponentIdAndSettings<S> componentAndSettings = allSettings.findComponentAndSettingsByLifecycle(componentLifecycle);
final S result;
if (componentAndSettings != null) {
result = componentAndSettings.getSettings();
} else {
result = null;
}
return null;
return result;
}
}