From 3b4432c18228a5ed0c65f275fbb199a30eedac76 Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Mon, 4 Feb 2019 11:24:26 +0100
Subject: [PATCH] Suppression de "return undefined" explicites
---
.../fieldset-container/fieldset-container.component.ts | 5 ++---
.../components/generic-calculator/calc-name.component.ts | 5 ++---
.../generic-calculator/calculator.component.ts | 1 -
.../components/generic-input/generic-input.component.ts | 2 --
.../param-field-line/param-field-line.component.ts | 2 --
src/app/components/param-link/param-link.component.ts | 9 +++------
src/app/components/param-values/ngparam-max.component.ts | 6 ++----
src/app/components/param-values/ngparam-min.component.ts | 6 ++----
.../components/param-values/ngparam-step.component.ts | 5 ++---
src/app/components/param-values/value-list.component.ts | 5 ++---
.../definition/concrete/form-parallel-structures.ts | 8 ++------
src/app/formulaire/definition/form-compute-fixedvar.ts | 1 -
src/app/formulaire/definition/form-definition.ts | 7 +------
src/app/formulaire/dependency/dependency.ts | 1 -
src/app/formulaire/fieldset.ts | 4 ----
src/app/formulaire/formulaire-element.ts | 1 -
src/app/formulaire/formulaire-node.ts | 4 ----
src/app/formulaire/select-field.ts | 1 -
18 files changed, 18 insertions(+), 55 deletions(-)
diff --git a/src/app/components/fieldset-container/fieldset-container.component.ts b/src/app/components/fieldset-container/fieldset-container.component.ts
index ccfedcec3..36c8199c3 100644
--- a/src/app/components/fieldset-container/fieldset-container.component.ts
+++ b/src/app/components/fieldset-container/fieldset-container.component.ts
@@ -12,10 +12,9 @@ import { FormulaireDefinition } from "../../formulaire/definition/form-definitio
export class FieldsetContainerComponent implements DoCheck, AfterViewInit {
public get title(): string {
- if (this._container === undefined) {
- return undefined;
+ if (this._container) {
+ return this._container.label;
}
- return this._container.label;
}
public get fieldsets() {
diff --git a/src/app/components/generic-calculator/calc-name.component.ts b/src/app/components/generic-calculator/calc-name.component.ts
index 21e9d67ac..860ed423f 100644
--- a/src/app/components/generic-calculator/calc-name.component.ts
+++ b/src/app/components/generic-calculator/calc-name.component.ts
@@ -23,10 +23,9 @@ export class CalculatorNameComponent extends GenericInputComponent {
* retourne la valeur du modèle
*/
protected getModelValue(): any {
- if (this._form === undefined) {
- return undefined;
+ if (this._form) {
+ return this._form.calculatorName;
}
- return this._form.calculatorName;
}
/**
diff --git a/src/app/components/generic-calculator/calculator.component.ts b/src/app/components/generic-calculator/calculator.component.ts
index 2a383b84c..bdde67531 100644
--- a/src/app/components/generic-calculator/calculator.component.ts
+++ b/src/app/components/generic-calculator/calculator.component.ts
@@ -132,7 +132,6 @@ export class GenericCalculatorComponent extends BaseComponent implements OnInit,
if (this.hasForm) {
return this.formulaireService.getLocalisedTitleFromCalculatorType(this._formulaire.calculatorType);
}
- return undefined;
}
public get uitextCalculer() {
diff --git a/src/app/components/generic-input/generic-input.component.ts b/src/app/components/generic-input/generic-input.component.ts
index 19e797a40..cd3e9e7dc 100644
--- a/src/app/components/generic-input/generic-input.component.ts
+++ b/src/app/components/generic-input/generic-input.component.ts
@@ -332,7 +332,6 @@ export class TestInputComponent extends GenericInputComponent {
protected modelToUI(v: any): string {
if (typeof (v) === "number")
return String(v);
- return undefined;
}
protected validateUIValue(ui: string): { isValid: boolean, message: string } {
@@ -398,7 +397,6 @@ export class Test2InputComponent extends GenericInputComponent {
protected modelToUI(v: any): string {
if (typeof (v) === "number")
return String(v);
- return undefined;
}
protected validateUIValue(ui: string): { isValid: boolean, message: string } {
diff --git a/src/app/components/param-field-line/param-field-line.component.ts b/src/app/components/param-field-line/param-field-line.component.ts
index d9d1a49cf..82608891a 100644
--- a/src/app/components/param-field-line/param-field-line.component.ts
+++ b/src/app/components/param-field-line/param-field-line.component.ts
@@ -92,7 +92,6 @@ export class ParamFieldLineComponent implements OnChanges {
if (this.param.radioState === ParamRadioConfig.CAL) {
return "checked";
}
- return undefined;
}
/**
@@ -102,7 +101,6 @@ export class ParamFieldLineComponent implements OnChanges {
if (this.param.radioState === ParamRadioConfig.LINK) {
return "checked";
}
- return undefined;
}
/**
diff --git a/src/app/components/param-link/param-link.component.ts b/src/app/components/param-link/param-link.component.ts
index 256558035..b0246dee5 100644
--- a/src/app/components/param-link/param-link.component.ts
+++ b/src/app/components/param-link/param-link.component.ts
@@ -91,14 +91,10 @@ export class ParamLinkComponent implements OnChanges, Observer, OnDestroy {
*/
public get currentLinkedParamLabel(): string {
if (this._linkableParams !== undefined) {
- if (this._currentIndex === -1 || this._currentIndex >= this._linkableParams.length) {
- return undefined;
+ if (this._currentIndex !== -1 && this._currentIndex < this._linkableParams.length) {
+ return this.selectItemLabel(this._linkableParams[this._currentIndex]);
}
-
- return this.selectItemLabel(this._linkableParams[this._currentIndex]);
}
-
- return undefined;
}
/**
@@ -208,6 +204,7 @@ export class ParamLinkComponent implements OnChanges, Observer, OnDestroy {
public update(sender: any, data: any) {
if (sender instanceof FormulaireService) {
switch (data["action"]) {
+ // scan newly created form for available linkable params
case "createForm":
this.updateParamList();
break;
diff --git a/src/app/components/param-values/ngparam-max.component.ts b/src/app/components/param-values/ngparam-max.component.ts
index 9a261c0de..d878dd68b 100644
--- a/src/app/components/param-values/ngparam-max.component.ts
+++ b/src/app/components/param-values/ngparam-max.component.ts
@@ -23,10 +23,9 @@ export class NgParamMaxComponent extends GenericInputComponent {
}
protected getModelValue(): any {
- if (this._param === undefined) {
- return undefined;
+ if (this._param) {
+ return this._param.maxValue;
}
- return this._param.maxValue;
}
protected setModelValue(sender: any, v: any) {
@@ -54,7 +53,6 @@ export class NgParamMaxComponent extends GenericInputComponent {
if (typeof (v) === "number") {
return String(v);
}
- return undefined;
}
protected validateUIValue(ui: string): { isValid: boolean, message: string } {
diff --git a/src/app/components/param-values/ngparam-min.component.ts b/src/app/components/param-values/ngparam-min.component.ts
index ee3186e2f..687df8d0e 100644
--- a/src/app/components/param-values/ngparam-min.component.ts
+++ b/src/app/components/param-values/ngparam-min.component.ts
@@ -23,10 +23,9 @@ export class NgParamMinComponent extends GenericInputComponent {
}
protected getModelValue(): any {
- if (this._param === undefined) {
- return undefined;
+ if (this._param) {
+ return this._param.minValue;
}
- return this._param.minValue;
}
protected setModelValue(sender: any, v: any) {
@@ -54,7 +53,6 @@ export class NgParamMinComponent extends GenericInputComponent {
if (typeof (v) === "number") {
return String(v);
}
- return undefined;
}
protected validateUIValue(ui: string): { isValid: boolean, message: string } {
diff --git a/src/app/components/param-values/ngparam-step.component.ts b/src/app/components/param-values/ngparam-step.component.ts
index 28f203c29..ac0fd27fd 100644
--- a/src/app/components/param-values/ngparam-step.component.ts
+++ b/src/app/components/param-values/ngparam-step.component.ts
@@ -23,10 +23,9 @@ export class NgParamStepComponent extends GenericInputComponent {
}
protected getModelValue(): any {
- if (! this._param) {
- return undefined;
+ if (this._param) {
+ return this._param.stepValue;
}
- return this._param.stepValue;
}
protected setModelValue(sender: any, v: any) {
diff --git a/src/app/components/param-values/value-list.component.ts b/src/app/components/param-values/value-list.component.ts
index 2f692e5b9..fa2fd379e 100644
--- a/src/app/components/param-values/value-list.component.ts
+++ b/src/app/components/param-values/value-list.component.ts
@@ -22,10 +22,9 @@ export class ValueListComponent extends GenericInputComponent {
}
protected getModelValue(): any {
- if (this._param === undefined || this._param === null) {
- return undefined;
+ if (! this._param) {
+ return this._param.valueList;
}
- return this._param.valueList;
}
protected setModelValue(sender: any, l: any) {
diff --git a/src/app/formulaire/definition/concrete/form-parallel-structures.ts b/src/app/formulaire/definition/concrete/form-parallel-structures.ts
index 4d5697248..8e563f732 100644
--- a/src/app/formulaire/definition/concrete/form-parallel-structures.ts
+++ b/src/app/formulaire/definition/concrete/form-parallel-structures.ts
@@ -223,11 +223,9 @@ export class FormulaireParallelStructure extends FormulaireDefinition {
}
}
- if (select === undefined) {
- return undefined;
+ if (select !== undefined) {
+ return { "select": select, "entry": selectEntry };
}
-
- return { "select": select, "entry": selectEntry };
}
/**
@@ -244,8 +242,6 @@ export class FormulaireParallelStructure extends FormulaireDefinition {
}
}
}
-
- return undefined;
}
/**
diff --git a/src/app/formulaire/definition/form-compute-fixedvar.ts b/src/app/formulaire/definition/form-compute-fixedvar.ts
index 873488018..7b64ec15d 100644
--- a/src/app/formulaire/definition/form-compute-fixedvar.ts
+++ b/src/app/formulaire/definition/form-compute-fixedvar.ts
@@ -26,7 +26,6 @@ export class FormComputeFixedVar extends FormCompute {
return p;
}
}
- return undefined;
}
private getComputedParameter(): NgParameter {
diff --git a/src/app/formulaire/definition/form-definition.ts b/src/app/formulaire/definition/form-definition.ts
index 5272f0772..2a1e305af 100644
--- a/src/app/formulaire/definition/form-definition.ts
+++ b/src/app/formulaire/definition/form-definition.ts
@@ -132,8 +132,6 @@ export abstract class FormulaireDefinition extends FormulaireNode implements Obs
if (json["type"] === "options") {
return json[option];
}
-
- return undefined;
}
public afterParseFieldset(fs: FieldSet) {
@@ -223,7 +221,7 @@ export abstract class FormulaireDefinition extends FormulaireNode implements Obs
/**
* 2ème passe d'analyse de la configuration
*/
- public parseConfig(json: {}) {
+ public parseConfig(json?: {}) {
if (json !== undefined) {
this._jsonConfig = json;
}
@@ -292,7 +290,6 @@ export abstract class FormulaireDefinition extends FormulaireNode implements Obs
}
}
}
- return undefined;
}
public getDisplayedParamFromState(st: ParamRadioConfig): NgParameter {
@@ -303,7 +300,6 @@ export abstract class FormulaireDefinition extends FormulaireNode implements Obs
}
}
}
- return undefined;
}
public getDisplayedParamListFromState(st: ParamRadioConfig): NgParameter[] {
@@ -321,7 +317,6 @@ export abstract class FormulaireDefinition extends FormulaireNode implements Obs
if (res instanceof Field) {
return res;
}
- return undefined;
}
public getParameterValue(symbol: string): number {
diff --git a/src/app/formulaire/dependency/dependency.ts b/src/app/formulaire/dependency/dependency.ts
index 368ac35a0..fe7426f55 100644
--- a/src/app/formulaire/dependency/dependency.ts
+++ b/src/app/formulaire/dependency/dependency.ts
@@ -28,7 +28,6 @@ export abstract class Dependency {
}
parentNode = parentNode.parent;
}
- return undefined;
}
protected get masterElement(): FormulaireElement {
diff --git a/src/app/formulaire/fieldset.ts b/src/app/formulaire/fieldset.ts
index ed645c97b..64bbcf197 100644
--- a/src/app/formulaire/fieldset.ts
+++ b/src/app/formulaire/fieldset.ts
@@ -76,7 +76,6 @@ export class FieldSet extends FormulaireElement implements Observer {
n++;
}
}
- return undefined;
}
public get isValid(): boolean {
@@ -314,8 +313,6 @@ export class FieldSet extends FormulaireElement implements Observer {
}
}
}
-
- return undefined;
}
public getNodeParameterValue(symbol: string): number {
@@ -346,7 +343,6 @@ export class FieldSet extends FormulaireElement implements Observer {
return FormulaireElement.removePrefix(value, selectFieldId + "_");
}
}
- return undefined;
}
// interface Observer
diff --git a/src/app/formulaire/formulaire-element.ts b/src/app/formulaire/formulaire-element.ts
index 0b55e21b8..c2347b6ee 100644
--- a/src/app/formulaire/formulaire-element.ts
+++ b/src/app/formulaire/formulaire-element.ts
@@ -36,7 +36,6 @@ export abstract class FormulaireElement extends FormulaireNode {
const l = prefix.length;
return s.substr(l, s.length - l);
}
- return undefined;
}
constructor(parent: FormulaireNode) {
diff --git a/src/app/formulaire/formulaire-node.ts b/src/app/formulaire/formulaire-node.ts
index 44245795e..627e38f7d 100644
--- a/src/app/formulaire/formulaire-node.ts
+++ b/src/app/formulaire/formulaire-node.ts
@@ -70,8 +70,6 @@ export abstract class FormulaireNode implements IObservable {
return res;
}
}
-
- return undefined;
}
/**
@@ -88,8 +86,6 @@ export abstract class FormulaireNode implements IObservable {
return res;
}
}
-
- return undefined;
}
/**
diff --git a/src/app/formulaire/select-field.ts b/src/app/formulaire/select-field.ts
index 3e3bd899d..3bfadc6cf 100644
--- a/src/app/formulaire/select-field.ts
+++ b/src/app/formulaire/select-field.ts
@@ -35,7 +35,6 @@ export class SelectField extends Field {
return se;
}
}
- return undefined;
}
public getValue() {
--
GitLab