New upstream version 1.2017.15

1 files changed, 166 insertions, 165 deletions

diff --git a/src/net/sourceforge/plantuml/project2/Project2.java b/src/net/sourceforge/plantuml/project2/Project2.java
index 13b3e67..ed5a2fe 100644
--- a/src/net/sourceforge/plantuml/project2/Project2.java
+++ b/src/net/sourceforge/plantuml/project2/Project2.java
@@ -1,165 +1,166 @@
-/* ========================================================================

- * PlantUML : a free UML diagram generator

- * ========================================================================

- *

- * (C) Copyright 2009-2017, Arnaud Roques

- *

- * Project Info:  http://plantuml.com

- * 

- * This file is part of PlantUML.

- *

- * Licensed under The MIT License (Massachusetts Institute of Technology License)

- * 

- * See http://opensource.org/licenses/MIT

- * 

- * Permission is hereby granted, free of charge, to any person obtaining

- * a copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- * 

- * The above copyright notice and this permission notice shall be included

- * in all copies or substantial portions of the Software.

- * 

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR

- * IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- * 

- *

- * Original Author:  Arnaud Roques

- */

-package net.sourceforge.plantuml.project2;

-

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.List;

-

-import net.sourceforge.plantuml.graphic.HorizontalAlignment;

-import net.sourceforge.plantuml.graphic.TextBlock;

-import net.sourceforge.plantuml.graphic.TextBlockUtils;

-

-public class Project2 implements TaskContainer {

-

-	private final TimeLine timeline;

-	private final Knowledge knowledge;

-	private final List<TaskImpl> tasks = new ArrayList<TaskImpl>();

-

-	public Project2() {

-		this.timeline = new TimeLineDay();

-		this.knowledge = new Knowledge(this, timeline);

-	}

-

-	public TimeConverter getTimeConverter(double dayWith) {

-		return new TimeConverterDay(timeline, getStart(), dayWith);

-	}

-

-	public Value getExpression(String exp) {

-		return knowledge.evaluate(exp);

-	}

-

-	public boolean affectation(String var, Value exp) {

-		final int idx = var.indexOf('$');

-		if (idx != -1) {

-			return affectationTask(var.substring(0, idx), var.substring(idx + 1), exp);

-		}

-		if (var.startsWith("^")) {

-			return affectationJalon(var.substring(1), exp);

-		}

-		knowledge.set(var, exp);

-		return true;

-	}

-

-	private boolean affectationJalon(String taskCode, Value exp) {

-		final TaskImpl result = new TaskImpl(timeline, taskCode);

-		result.setStart(((ValueTime) exp).getValue());

-		result.setDuration(0);

-		tasks.add(result);

-		knowledge.set(taskCode, exp);

-		return true;

-	}

-

-	private boolean affectationTask(String taskCode, String attribute, Value exp) {

-		final TaskImpl t = getOrCreateTask(taskCode);

-		final TaskAttribute att = TaskAttribute.fromString(attribute);

-		if (att == TaskAttribute.START) {

-			t.setStart(((ValueTime) exp).getValue());

-			return true;

-		}

-		if (att == TaskAttribute.DURATION) {

-			t.setDuration(((ValueInt) exp).getValue());

-			return true;

-		}

-		if (att == TaskAttribute.LOAD) {

-			t.setLoad(((ValueInt) exp).getValue());

-			return true;

-		}

-		throw new UnsupportedOperationException();

-	}

-

-	private TaskImpl getOrCreateTask(String taskCode) {

-		TaskImpl result = (TaskImpl) getTask(taskCode);

-		if (result != null) {

-			return result;

-		}

-		result = new TaskImpl(timeline, taskCode);

-		tasks.add(result);

-		return result;

-	}

-

-	public final List<Task> getTasks() {

-		final List<Task> result = new ArrayList<Task>(tasks);

-		return Collections.unmodifiableList(result);

-	}

-

-	public Task getTask(String code) {

-		for (TaskImpl t : tasks) {

-			if (t.getCode().equals(code)) {

-				return t;

-			}

-		}

-		Task result = null;

-		for (Task t : tasks) {

-			if (t.getCode().startsWith(code) == false) {

-				continue;

-			}

-			if (result == null) {

-				result = t;

-			} else {

-				result = new TaskMerge(result.getCode(), result.getName(), result, t);

-			}

-

-		}

-		return result;

-	}

-

-	public TextBlock getTimeHeader(double dayWith) {

-		final TimeHeaderDay day = new TimeHeaderDay(getStart(), getEnd(), timeline, dayWith);

-		final TimeHeaderMonth month = new TimeHeaderMonth(getStart(), getEnd(), timeline, dayWith);

-		return TextBlockUtils.mergeTB(month, day, HorizontalAlignment.CENTER);

-	}

-

-	private Day getStart() {

-		Day result = null;

-		for (Task t : tasks) {

-			if (result == null || result.compareTo(t.getStart()) > 0) {

-				result = (Day) t.getStart();

-			}

-		}

-		return result;

-	}

-

-	private Day getEnd() {

-		Day result = null;

-		for (Task t : tasks) {

-			if (result == null || result.compareTo(t.getEnd()) < 0) {

-				result = (Day) t.getEnd();

-			}

-		}

-		return result;

-	}

-

-}

+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * Project Info:  http://plantuml.com
+ * 
+ * If you like this project or if you find it useful, you can support us at:
+ * 
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ * 
+ * This file is part of PlantUML.
+ *
+ * PlantUML is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PlantUML distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+ * USA.
+ *
+ *
+ * Original Author:  Arnaud Roques
+ * 
+ *
+ */
+package net.sourceforge.plantuml.project2;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import net.sourceforge.plantuml.graphic.HorizontalAlignment;
+import net.sourceforge.plantuml.graphic.TextBlock;
+import net.sourceforge.plantuml.graphic.TextBlockUtils;
+
+public class Project2 implements TaskContainer {
+
+	private final TimeLine timeline;
+	private final Knowledge knowledge;
+	private final List<TaskImpl> tasks = new ArrayList<TaskImpl>();
+
+	public Project2() {
+		this.timeline = new TimeLineDay();
+		this.knowledge = new Knowledge(this, timeline);
+	}
+
+	public TimeConverter getTimeConverter(double dayWith) {
+		return new TimeConverterDay(timeline, getStart(), dayWith);
+	}
+
+	public Value getExpression(String exp) {
+		return knowledge.evaluate(exp);
+	}
+
+	public boolean affectation(String var, Value exp) {
+		final int idx = var.indexOf('$');
+		if (idx != -1) {
+			return affectationTask(var.substring(0, idx), var.substring(idx + 1), exp);
+		}
+		if (var.startsWith("^")) {
+			return affectationJalon(var.substring(1), exp);
+		}
+		knowledge.set(var, exp);
+		return true;
+	}
+
+	private boolean affectationJalon(String taskCode, Value exp) {
+		final TaskImpl result = new TaskImpl(timeline, taskCode);
+		result.setStart(((ValueTime) exp).getValue());
+		result.setDuration(0);
+		tasks.add(result);
+		knowledge.set(taskCode, exp);
+		return true;
+	}
+
+	private boolean affectationTask(String taskCode, String attribute, Value exp) {
+		final TaskImpl t = getOrCreateTask(taskCode);
+		final TaskAttribute att = TaskAttribute.fromString(attribute);
+		if (att == TaskAttribute.START) {
+			t.setStart(((ValueTime) exp).getValue());
+			return true;
+		}
+		if (att == TaskAttribute.DURATION) {
+			t.setDuration(((ValueInt) exp).getValue());
+			return true;
+		}
+		if (att == TaskAttribute.LOAD) {
+			t.setLoad(((ValueInt) exp).getValue());
+			return true;
+		}
+		throw new UnsupportedOperationException();
+	}
+
+	private TaskImpl getOrCreateTask(String taskCode) {
+		TaskImpl result = (TaskImpl) getTask(taskCode);
+		if (result != null) {
+			return result;
+		}
+		result = new TaskImpl(timeline, taskCode);
+		tasks.add(result);
+		return result;
+	}
+
+	public final List<Task> getTasks() {
+		final List<Task> result = new ArrayList<Task>(tasks);
+		return Collections.unmodifiableList(result);
+	}
+
+	public Task getTask(String code) {
+		for (TaskImpl t : tasks) {
+			if (t.getCode().equals(code)) {
+				return t;
+			}
+		}
+		Task result = null;
+		for (Task t : tasks) {
+			if (t.getCode().startsWith(code) == false) {
+				continue;
+			}
+			if (result == null) {
+				result = t;
+			} else {
+				result = new TaskMerge(result.getCode(), result.getName(), result, t);
+			}
+
+		}
+		return result;
+	}
+
+	public TextBlock getTimeHeader(double dayWith) {
+		final TimeHeaderDay day = new TimeHeaderDay(getStart(), getEnd(), timeline, dayWith);
+		final TimeHeaderMonth month = new TimeHeaderMonth(getStart(), getEnd(), timeline, dayWith);
+		return TextBlockUtils.mergeTB(month, day, HorizontalAlignment.CENTER);
+	}
+
+	private Day getStart() {
+		Day result = null;
+		for (Task t : tasks) {
+			if (result == null || result.compareTo(t.getStart()) > 0) {
+				result = (Day) t.getStart();
+			}
+		}
+		return result;
+	}
+
+	private Day getEnd() {
+		Day result = null;
+		for (Task t : tasks) {
+			if (result == null || result.compareTo(t.getEnd()) < 0) {
+				result = (Day) t.getEnd();
+			}
+		}
+		return result;
+	}
+
+}