Follow-up on the cleansing of the warnings in GAMA code

Signed-off-by: AlexisDrogoul <alexis.drogoul@gmail.com>
gama-platform · Oct 5, 2016 · cb31eaf · cb31eaf
1 parent 52b9fce
commit cb31eaf
Show file tree

Hide file tree

Showing 71 changed files with 5,041 additions and 4,667 deletions.
diff --git a/irit.gaml.extensions.test/src/irit/gaml/extensions/test/statements/AssertStatement.java b/irit.gaml.extensions.test/src/irit/gaml/extensions/test/statements/AssertStatement.java
@@ -83,13 +83,13 @@ public Object privateExecuteIn(final IScope scope) throws GamaRuntimeException {
 							+ " is not equals to " + equals.value(scope), scope);
 				}
 				return null;
-			} else {
-				if (equals.value(scope) != null) {
-					throw GamaRuntimeException.error("Assert equals ERROR : " + value.serialize(false)
-							+ " is not equals to " + equals.value(scope), scope);
-				}
-				return null;
 			}
+			if (equals.value(scope) != null) {
+				throw GamaRuntimeException.error(
+						"Assert equals ERROR : " + value.serialize(false) + " is not equals to " + equals.value(scope),
+						scope);
+			}
+			return null;
 		}
 
 		if (isnot != null) {

diff --git a/msi.gama.application/src/msi/gama/application/workbench/PerspectiveHelper.java b/msi.gama.application/src/msi/gama/application/workbench/PerspectiveHelper.java
@@ -87,7 +87,7 @@ public static boolean openPerspective(final String perspectiveId, final boolean
 			return true;
 
 		IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-		if ( activePage == null && perspectiveId != null )
+		if ( activePage == null )
 			try {
 				activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().openPage(perspectiveId, null);
 			} catch (final WorkbenchException e1) {

diff --git a/msi.gama.core/src/msi/gama/common/util/GeometryUtils.java b/msi.gama.core/src/msi/gama/common/util/GeometryUtils.java
@@ -1025,6 +1025,7 @@ public static IList<IShape> split_at(final IShape geom, final ILocation pt) {
 					distMin = dist;
 				}
 			}
+			@SuppressWarnings("null")
 			final Coordinate[] coords = ((LineString) geom2).getCoordinates();
 			final Point pt1 = FACTORY.createPoint(new GamaPoint(pt.getLocation()));
 			final int nb = coords.length;

diff --git a/msi.gama.core/src/msi/gama/kernel/experiment/BatchAgent.java b/msi.gama.core/src/msi/gama/kernel/experiment/BatchAgent.java
@@ -95,6 +95,7 @@ public Object _init_(final IScope scope) {
 		return this;
 	}
 
+	@SuppressWarnings("null")
 	@Override
 	public void reset() {
 		// We first save the results of the various simulations

diff --git a/msi.gama.core/src/msi/gama/kernel/experiment/ExperimentAgent.java b/msi.gama.core/src/msi/gama/kernel/experiment/ExperimentAgent.java
@@ -673,9 +673,8 @@ public Object getAgentVarValue(final IAgent a, final String name) {
 		public IGui getGui() {
 			if (getSpecies().isHeadless()) {
 				return GAMA.getHeadlessGui();
-			} else {
-				return GAMA.getRegularGui();
 			}
+			return GAMA.getRegularGui();
 		}
 
 	}

diff --git a/msi.gama.core/src/msi/gama/kernel/model/GamlModelSpecies.java b/msi.gama.core/src/msi/gama/kernel/model/GamlModelSpecies.java
@@ -170,21 +170,18 @@ public ISpecies getSpecies(final String speciesName, final SpeciesDescription sp
 		}
 		// hqnghi 11/Oct/13
 		// get experiementSpecies in any model
-		ISpecies sp = null;
+		ISpecies sp = getExperiment(speciesName);
 		if (sp == null) {
-			sp = getExperiment(speciesName);
-			if (sp == null) {
-				for (final ISpecies mm : getAllSpecies().values()) {
-					if (mm instanceof GamlModelSpecies && specDes.getOriginName().equals(mm.getName())) {
-						sp = ((GamlModelSpecies) mm).getExperiment(speciesName);
-						if (sp != null) {
-							return sp;
-						}
+			for (final ISpecies mm : getAllSpecies().values()) {
+				if (mm instanceof GamlModelSpecies && specDes.getOriginName().equals(mm.getName())) {
+					sp = ((GamlModelSpecies) mm).getExperiment(speciesName);
+					if (sp != null) {
+						return sp;
 					}
 				}
 			}
-			sp = getAllSpecies().get(speciesName);
 		}
+		sp = getAllSpecies().get(speciesName);
 		return sp;
 	}
 

diff --git a/msi.gama.core/src/msi/gama/kernel/simulation/SimulationAgent.java b/msi.gama.core/src/msi/gama/kernel/simulation/SimulationAgent.java
@@ -179,7 +179,7 @@ public SimulationAgent getSimulation() {
 	public void setTopology(final IScope scope, final IShape shape) {
 		// A topology has already been computed. We update it and updates all
 		// the agents present in the spatial index
-		if (topology instanceof RootTopology) {
+		if (topology != null) {
 			topology.updateEnvironment(shape);
 		} else {
 			final IExpression expr = getSpecies().getFacet(IKeyword.TORUS);

diff --git a/msi.gama.core/src/msi/gama/metamodel/agent/AbstractAgent.java b/msi.gama.core/src/msi/gama/metamodel/agent/AbstractAgent.java
@@ -529,9 +529,8 @@ public IType getType() {
 	public Object get(final IScope scope, final String index) throws GamaRuntimeException {
 		if (getPopulation().hasVar(index)) {
 			return scope.getAgentVarValue(this, index);
-		} else {
-			return getAttribute(index);
 		}
+		return getAttribute(index);
 	}
 
 	/**

diff --git a/msi.gama.core/src/msi/gama/metamodel/population/GamaPopulation.java b/msi.gama.core/src/msi/gama/metamodel/population/GamaPopulation.java
@@ -410,6 +410,7 @@ public void createVariablesFor(final IScope scope, final List<? extends IAgent>
 	// }
 	// }
 
+	@SuppressWarnings("null")
 	public void createAndUpdateVariablesFor(final IScope scope, final List<? extends IAgent> agents,
 			final List<? extends Map> initialValues, final boolean update) throws GamaRuntimeException {
 		if (agents == null || agents.isEmpty()) {

diff --git a/msi.gama.core/src/msi/gama/metamodel/topology/AbstractTopology.java b/msi.gama.core/src/msi/gama/metamodel/topology/AbstractTopology.java
@@ -322,10 +322,8 @@ public ILocation normalizeLocation3D(final ILocation point, final boolean nullIf
 				return null;
 			}
 			return point;
-		} else {
-			throw GamaRuntimeException.error("The environement must be a 3D environment (e.g shape <- cube(100).",
-					null);
 		}
+		throw GamaRuntimeException.error("The environement must be a 3D environment (e.g shape <- cube(100).", null);
 
 	}
 

diff --git a/msi.gama.core/src/msi/gama/metamodel/topology/CompoundSpatialIndex.java b/msi.gama.core/src/msi/gama/metamodel/topology/CompoundSpatialIndex.java
@@ -142,9 +142,8 @@ public IAgent firstAtDistance(final IScope scope, final IShape source, final dou
 		final int id = findSpatialIndexes(f);
 		if (id != -1) {
 			return firstAtDistance(scope, source, f, all[id]);
-		} else {
-			return firstAtDistance(scope, source, f);
 		}
+		return firstAtDistance(scope, source, f);
 	}
 
 	@Override

diff --git a/msi.gama.core/src/msi/gama/metamodel/topology/graph/AStar.java b/msi.gama.core/src/msi/gama/metamodel/topology/graph/AStar.java
@@ -127,29 +127,28 @@ protected void aStar(final V sourceNode, final V targetNode) {
 				isPathFound = true;
 				result = buildPath(current);
 				return;
-			} else {
-				openMap.remove(current.node);
-				closedMap.put(current.node, current);
-				final _Vertex<V, E> node = graph.getVertex(current.node);
-				final Set<E> edges = new HashSet<E>(node.getOutEdges());
-				if (!graph.isDirected()) {
-					edges.addAll(node.getInEdges());
+			}
+			openMap.remove(current.node);
+			closedMap.put(current.node, current);
+			final _Vertex<V, E> node = graph.getVertex(current.node);
+			final Set<E> edges = new HashSet<E>(node.getOutEdges());
+			if (!graph.isDirected()) {
+				edges.addAll(node.getInEdges());
 
-				}
-				for (final E edge : edges) {
-					final _Edge<V, E> eg = graph.getEdge(edge);
-					final V next = (V) (eg.getTarget().equals(current.node) ? eg.getSource() : eg.getTarget());
-					if (closedMap.containsKey(next))
-						continue;
-
-					final double h = heuristic(next, targetNode);
-					final double g = current.g + eg.getWeight();
-					final ASNode openNode = openMap.get(next);
-					if (openNode == null)
-						openMap.put(next, new ASNode(next, edge, current, g, h));
-					else if (g >= openNode.rank) {
-						continue;
-					}
+			}
+			for (final E edge : edges) {
+				final _Edge<V, E> eg = graph.getEdge(edge);
+				final V next = (V) (eg.getTarget().equals(current.node) ? eg.getSource() : eg.getTarget());
+				if (closedMap.containsKey(next))
+					continue;
+
+				final double h = heuristic(next, targetNode);
+				final double g = current.g + eg.getWeight();
+				final ASNode openNode = openMap.get(next);
+				if (openNode == null)
+					openMap.put(next, new ASNode(next, edge, current, g, h));
+				else if (g >= openNode.rank) {
+					continue;
 				}
 			}
 		}

diff --git a/msi.gama.core/src/msi/gama/outputs/ExperimentOutputManager.java b/msi.gama.core/src/msi/gama/outputs/ExperimentOutputManager.java
@@ -75,8 +75,8 @@ public boolean init(final IScope scope) {
 				GAMA.startFrontmostExperiment();
 			}
 			return true;
-		} else
-			return false;
+		}
+		return false;
 	}
 
 	protected int getLayout() {

diff --git a/msi.gama.core/src/msi/gama/outputs/display/AbstractDisplayGraphics.java b/msi.gama.core/src/msi/gama/outputs/display/AbstractDisplayGraphics.java
@@ -80,9 +80,8 @@ protected final double hFromModelUnitsToPixels(final double mu) {
 	public double getxRatioBetweenPixelsAndModelUnits() {
 		if (currentLayer == null) {
 			return getDisplayWidth() / data.getEnvWidth();
-		} else {
-			return currentLayer.getSizeInPixels().x / data.getEnvWidth();
 		}
+		return currentLayer.getSizeInPixels().x / data.getEnvWidth();
 	}
 
 	@Override

diff --git a/msi.gama.core/src/msi/gama/outputs/layers/AgentLayerStatement.java b/msi.gama.core/src/msi/gama/outputs/layers/AgentLayerStatement.java
@@ -108,12 +108,10 @@ public void validate(final StatementDescription description) {
 					description.error(ed.toString() + " is not the description of a species", IGamlIssue.WRONG_TYPE,
 							ed.getTarget());
 					return;
-				} else {
-					if (description.getKeyword().equals(GRID_POPULATION) && !target.isGrid()) {
-						description.error(target + " is not a grid", IGamlIssue.WRONG_TYPE, ed.getTarget());
-						return;
-					}
-
+				}
+				if (description.getKeyword().equals(GRID_POPULATION) && !target.isGrid()) {
+					description.error(target + " is not a grid", IGamlIssue.WRONG_TYPE, ed.getTarget());
+					return;
 				}
 			}
 			ed = description.getFacet(ASPECT);

diff --git a/msi.gama.core/src/msi/gama/outputs/layers/charts/ChartDataSeries.java b/msi.gama.core/src/msi/gama/outputs/layers/charts/ChartDataSeries.java
@@ -227,9 +227,8 @@ private Object getlistvalue(final IScope scope, final HashMap barvalues, final S
 				return null;
 			return ol.get(listvalue);
 
-		} else {
-			return o;
 		}
+		return o;
 
 	}
 

diff --git a/msi.gama.core/src/msi/gama/outputs/layers/charts/ChartDataSet.java b/msi.gama.core/src/msi/gama/outputs/layers/charts/ChartDataSet.java
@@ -99,22 +99,20 @@ public String getCategories(final IScope scope, final int i) {
 		if (Xcategories.size() > i) {
 			return Xcategories.get(i);
 
-		} else {
-			for (int c = Xcategories.size(); c <= i; c++) {
-				this.Xcategories.add("c" + c);
-			}
-			return Xcategories.get(i);
 		}
+		for (int c = Xcategories.size(); c <= i; c++) {
+			this.Xcategories.add("c" + c);
+		}
+		return Xcategories.get(i);
 	}
 
 	public String getLastCategories(final IScope scope) {
 		if (Xcategories.size() > 0) {
 			return Xcategories.get(Xcategories.size() - 1);
 
-		} else {
-			this.Xcategories.add("c" + 0);
-			return Xcategories.get(Xcategories.size() - 1);
 		}
+		this.Xcategories.add("c" + 0);
+		return Xcategories.get(Xcategories.size() - 1);
 	}
 
 	public void setCategories(final ArrayList<String> categories) {
@@ -537,26 +535,23 @@ public ChartDataSeries createOrGetSerie(final IScope scope, final String id, fin
 		// TODO Auto-generated method stub
 		if (series.keySet().contains(id)) {
 			return series.get(id);
-		} else {
-			if (deletedseries.keySet().contains(id)) {
-				final ChartDataSeries myserie = deletedseries.get(id);
-				deletedseries.remove(id);
-				this.serieRemovalDate.put(id, -1);
-				myserie.setMysource(source);
-				myserie.setDataset(this);
-				myserie.setName(id);
-				addNewSerie(id, myserie, getDate(scope));
-				return myserie;
-			} else {
-				final ChartDataSeries myserie = new ChartDataSeries();
-				myserie.setMysource(source);
-				myserie.setDataset(this);
-				myserie.setName(id);
-				addNewSerie(id, myserie, getDate(scope));
-				return myserie;
-			}
-
 		}
+		if (deletedseries.keySet().contains(id)) {
+			final ChartDataSeries myserie = deletedseries.get(id);
+			deletedseries.remove(id);
+			this.serieRemovalDate.put(id, -1);
+			myserie.setMysource(source);
+			myserie.setDataset(this);
+			myserie.setName(id);
+			addNewSerie(id, myserie, getDate(scope));
+			return myserie;
+		}
+		final ChartDataSeries myserie = new ChartDataSeries();
+		myserie.setMysource(source);
+		myserie.setDataset(this);
+		myserie.setName(id);
+		addNewSerie(id, myserie, getDate(scope));
+		return myserie;
 
 	}
 

diff --git a/msi.gama.core/src/msi/gama/outputs/layers/charts/ChartJFreeChartOutput.java b/msi.gama.core/src/msi/gama/outputs/layers/charts/ChartJFreeChartOutput.java
@@ -160,11 +160,10 @@ public void initChart(final IScope scope, final String chartname) {
 	AbstractRenderer getOrCreateRenderer(final IScope scope, final String serieid) {
 		if (RendererSet.containsKey(serieid)) {
 			return RendererSet.get(serieid);
-		} else {
-			final AbstractRenderer newrenderer = createRenderer(scope, serieid);
-			RendererSet.put(serieid, newrenderer);
-			return newrenderer;
 		}
+		final AbstractRenderer newrenderer = createRenderer(scope, serieid);
+		RendererSet.put(serieid, newrenderer);
+		return newrenderer;
 
 	}
 

diff --git a/msi.gama.core/src/msi/gama/outputs/layers/charts/ChartJFreeChartOutputHeatmap.java b/msi.gama.core/src/msi/gama/outputs/layers/charts/ChartJFreeChartOutputHeatmap.java
@@ -379,10 +379,8 @@ public StringBuffer format(final double number, final StringBuffer toAppendTo, f
 				final int ind = chartdataset.XSeriesValues.indexOf(number);
 				if (ind >= 0) {
 					return new StringBuffer("" + chartdataset.Xcategories.get(ind));
-				} else {
-					return new StringBuffer("");
-
 				}
+				return new StringBuffer("");
 
 			}
 
@@ -412,10 +410,8 @@ public StringBuffer format(final double number, final StringBuffer toAppendTo, f
 				final int ind = chartdataset.YSeriesValues.indexOf(number);
 				if (ind >= 0) {
 					return new StringBuffer("" + chartdataset.Ycategories.get(ind));
-				} else {
-					return new StringBuffer("");
-
 				}
+				return new StringBuffer("");
 
 			}
 

diff --git a/msi.gama.core/src/msi/gama/outputs/layers/charts/ChartJFreeChartOutputScatter.java b/msi.gama.core/src/msi/gama/outputs/layers/charts/ChartJFreeChartOutputScatter.java
@@ -82,18 +82,16 @@ public Shape getItemShape(final int row, final int col) {
 			if (isUseSize()) {
 				transform.setToScale(myoutput.getScale(myid, col), myoutput.getScale(myid, col));
 				return transform.createTransformedShape(super.getItemShape(row, col));
-			} else {
-				return super.getItemShape(row, col);
 			}
+			return super.getItemShape(row, col);
 		}
 	}
 
 	double getScale(final String serie, final int col) {
 		if (MarkerScale.containsKey(serie)) {
 			return MarkerScale.get(serie).get(col);
-		} else {
-			return 1;
 		}
+		return 1;
 	}
 
 	HashMap<String, ArrayList<Double>> MarkerScale = new HashMap<String, ArrayList<Double>>();
@@ -504,10 +502,8 @@ public StringBuffer format(final double number, final StringBuffer toAppendTo, f
 				final int ind = chartdataset.XSeriesValues.indexOf(number);
 				if (ind >= 0) {
 					return new StringBuffer("" + chartdataset.Xcategories.get(ind));
-				} else {
-					return new StringBuffer("");
-
 				}
+				return new StringBuffer("");
 
 			}
 

diff --git a/msi.gama.core/src/msi/gama/runtime/AbstractScope.java b/msi.gama.core/src/msi/gama/runtime/AbstractScope.java
@@ -885,9 +885,8 @@ public IGui getGui() {
 		}
 		if (experiment.getSpecies().isHeadless()) {
 			return GAMA.getHeadlessGui();
-		} else {
-			return GAMA.getRegularGui();
 		}
+		return GAMA.getRegularGui();
 	}
 
 	@Override