Merge branch 'master' of https://github.com/genericsystem/genericsyst…

…em2015
genericsystem · Sep 2, 2016 · df78d7a · df78d7a
2 parents 7bce3c5 + a3cc497
commit df78d7a
Show file tree

Hide file tree

Showing 37 changed files with 585 additions and 382 deletions.
diff --git a/gs-api/src/main/java/org/genericsystem/api/core/ISignature.java b/gs-api/src/main/java/org/genericsystem/api/core/ISignature.java
@@ -46,13 +46,17 @@ public interface ISignature<T extends ISignature<T>> {
 	List<T> getComponents();
 
 	/**
-	 * Returns the <code>JSonId</code> of this signature.
+	 * Returns the unique id of this signature.
 	 *
-	 * @return the <code>JSonObject</code> representing this signature.
+	 * @return the design date representing this signature.
 	 */
-
 	long getTs();
 
+	/**
+	 * Returns the birth ts of this signature.
+	 *
+	 * @return the ts of the transaction that make alive this signature.
+	 */
 	long getBirthTs();
 
 }
diff --git a/gs-carcolor/src/main/java/org/genericsystem/carcolor/GSUserGuide.java b/gs-carcolor/src/main/java/org/genericsystem/carcolor/GSUserGuide.java
@@ -3,25 +3,25 @@
 import org.genericsystem.reactor.Tag;
 import org.genericsystem.reactor.gs.FlexDirection;
 import org.genericsystem.reactor.gs.GSModalButton;
-import org.genericsystem.reactor.gs.GSSection;
+import org.genericsystem.reactor.gs.GSDiv;
 import org.genericsystem.reactor.gstag.HtmlHyperLink;
 import org.genericsystem.reactor.gstag.HtmlLi;
 import org.genericsystem.reactor.gstag.HtmlUl;
 
-public class GSUserGuide extends GSSection {
+public class GSUserGuide extends GSDiv {
 
 	public GSUserGuide(Tag parent) {
 		super(parent, FlexDirection.COLUMN);
 		addStyle("flex-direction", "column");
 		addStyle("flex-wrap", "nowrap");
 		addStyle("justify-content", "center");
 
-		GSSection gSection = new GSSection(this, FlexDirection.COLUMN) {
+		GSDiv gSection = new GSDiv(this, FlexDirection.COLUMN) {
 			{
 				addStyleClass("modal");
 				createInitializedDisplayProperty("none");
 				bindStyle(DISPLAY, DISPLAY);
-				new GSSection(this, FlexDirection.COLUMN) {
+				new GSDiv(this, FlexDirection.COLUMN) {
 					{
 						addStyle("max-width", "40%");
 						addStyleClass("modal-content");
@@ -34,7 +34,7 @@ public GSUserGuide(Tag parent) {
 								});
 							}
 						};
-						new GSSection(this, FlexDirection.COLUMN) {
+						new GSDiv(this, FlexDirection.COLUMN) {
 							{
 								setText("How to use CarColor Demo");
 								new HtmlUl(this) {
@@ -73,7 +73,7 @@ public GSUserGuide(Tag parent) {
 
 									}
 								};
-								new GSSection(this, FlexDirection.COLUMN) {
+								new GSDiv(this, FlexDirection.COLUMN) {
 									{
 										addStyle("text-align", "center");
 										setText("To plenty enjoy the power of GS-REACTOR, go to Learning / Get Started");
@@ -85,7 +85,7 @@ public GSUserGuide(Tag parent) {
 				};
 			}
 		};
-		new GSSection(this, FlexDirection.ROW) {
+		new GSDiv(this, FlexDirection.ROW) {
 			{
 				addStyle("justify-content", "center");
 				new GSModalButton(this, gSection) {

diff --git a/gs-carcolor/src/main/resources/carcolorapp.js b/gs-carcolor/src/main/resources/carcolorapp.js
@@ -107,6 +107,9 @@ function onMessageReceived(evt) {
 		case "section": 
 			elt.classList.add("adding");
 			break;
+		case "div":
+			elt.classList.add("adding");
+			break;
 		case "header": 
 			elt.classList.add("adding");
 			break;

diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/Context.java b/gs-reactor/src/main/java/org/genericsystem/reactor/Context.java
@@ -1,6 +1,5 @@
 package org.genericsystem.reactor;
 
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -29,6 +28,7 @@ public class Context {
 	private Map<Tag, ObservableList<Context>> subContextsMap = new HashMap<>();
 	private Map<Tag, Map<String, ObservableValue<?>>> propertiesMap = new HashMap<>();
 	private final Generic[] generics;
+	private boolean destroyed = false;
 
 	public Context(Context parent, Generic[] generics) {
 		this.parent = parent;
@@ -103,8 +103,6 @@ public void destroy() {
 		internalDestroy();
 	}
 
-	public boolean destroyed = false;
-
 	public void internalDestroy() {
 		// System.out.println("InternalDestroy : " + this);
 		assert !destroyed;
@@ -182,15 +180,12 @@ public long shiftTs() throws RollbackException {
 	}
 
 	public void traverse() {
-		// System.out.println("traverse " + Arrays.toString(getGenerics()) + " "
-		// + isOpaque());
-		if (isOpaque()) {
-			// Tag tag = new ArrayList<>(htmlDomNodesMap.keySet()).get(0);
-			System.out.println("removeStyleClasse Opaque" + Arrays.toString(getGenerics()));
+		if (isOpaque())
 			htmlDomNodesMap.keySet().stream().forEach(tag -> tag.removeStyleClass(this, "opaque"));
-		}
 		subContextsMap.values().stream().flatMap(c -> c.stream()).forEach(Context::traverse);
-
 	}
 
+	public boolean isDestroyed() {
+		return destroyed;
+	}
 }
diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/HtmlDomNode.java b/gs-reactor/src/main/java/org/genericsystem/reactor/HtmlDomNode.java
@@ -1,6 +1,5 @@
 package org.genericsystem.reactor;
 
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.IdentityHashMap;
 import java.util.Map;
@@ -74,7 +73,10 @@ public HtmlDomNode(HtmlDomNode parent, Context modelContext, Tag tag) {
 	// for (Tag childTag : change.getAddedSubList()) {
 	// MetaBinding<BETWEEN> metaBinding = childTag.<BETWEEN> getMetaBinding();
 	// if (metaBinding != null) {
-	// modelContext.setSubContexts(childTag, new TransformationObservableList<BETWEEN, Context>(metaBinding.buildBetweenChildren(modelContext), (i, between) -> {
+	// modelContext.setSubContexts(childTag, new
+	// TransformationObservableList<BETWEEN,
+	// Context>(metaBinding.buildBetweenChildren(modelContext), (i, between) ->
+	// {
 	// Context childModel = metaBinding.buildModel(modelContext, between);
 	// createChildDomNode(i, childModel, childTag);
 	// return childModel;
@@ -110,12 +112,8 @@ protected <BETWEEN> void init(int index) {
 	}
 
 	public void createChildDomNode(int index, Context childContext, Tag childTag) {
-
-		if (childContext.isOpaque()) {
-			System.out.println("addStyle Opaque " + Arrays.toString(childContext.getGenerics()));
+		if (childContext.isOpaque())
 			childTag.addStyleClass("opaque");
-		}
-
 		childTag.createNode(this, childContext).init(computeIndex(index, childTag));
 	}
 
@@ -205,7 +203,9 @@ else if (change.wasAdded())
 	private final ChangeListener<String> textListener = (o, old, newValue) -> sendMessage(new JsonObject().put(MSG_TYPE, UPDATE_TEXT).put(ID, getId()).put(TEXT_CONTENT, newValue != null ? newValue : ""));
 
 	private final ChangeListener<Number> indexListener = (o, old, newValue) -> {
-		// System.out.println(new JsonObject().put(MSG_TYPE, UPDATE_SELECTION).put(ID, getId()).put(SELECTED_INDEX, newValue != null ? newValue : 0)
+		// System.out.println(new JsonObject().put(MSG_TYPE,
+		// UPDATE_SELECTION).put(ID, getId()).put(SELECTED_INDEX, newValue !=
+		// null ? newValue : 0)
 		// .encodePrettily());
 		sendMessage(new JsonObject().put(MSG_TYPE, UPDATE_SELECTION).put(ID, getId()).put(SELECTED_INDEX, newValue != null ? newValue : 0));
 	};
@@ -247,12 +247,14 @@ public JsonObject fillJson(JsonObject jsonObj) {
 
 	public void sendRemove() {
 		sendMessage(new JsonObject().put(MSG_TYPE, REMOVE).put(ID, id));
-		// System.out.println(new JsonObject().put(MSG_TYPE, REMOVE).put(ID, id).encodePrettily());
+		// System.out.println(new JsonObject().put(MSG_TYPE, REMOVE).put(ID,
+		// id).encodePrettily());
 	}
 
 	public void sendMessage(JsonObject jsonObj) {
 		jsonObj.put("count", count++);
-		// if (jsonObj.getString(MSG_TYPE).equals(ADD) || jsonObj.getString(MSG_TYPE).equals(REMOVE))
+		// if (jsonObj.getString(MSG_TYPE).equals(ADD) ||
+		// jsonObj.getString(MSG_TYPE).equals(REMOVE))
 		// System.out.println(jsonObj.encodePrettily());
 		getWebSocket().writeFinalTextFrame(jsonObj.encode());
 	}

diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/gs/GSApp.java b/gs-reactor/src/main/java/org/genericsystem/reactor/gs/GSApp.java
@@ -7,7 +7,7 @@
 import org.genericsystem.reactor.HtmlDomNode.RootHtmlDomNode;
 import org.genericsystem.reactor.Tag.RootTag;
 
-public class GSApp extends GSSection implements RootTag {
+public class GSApp extends GSDiv implements RootTag {
 
 	public GSApp() {
 		super(null, FlexDirection.COLUMN);

diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/gs/GSAttributeOfInstanceEditor.java b/gs-reactor/src/main/java/org/genericsystem/reactor/gs/GSAttributeOfInstanceEditor.java
@@ -14,25 +14,25 @@
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
-public class GSAttributeOfInstanceEditor extends GSSection {
+public class GSAttributeOfInstanceEditor extends GSDiv {
 
 	public GSAttributeOfInstanceEditor(Tag parent) {
 		super(parent, FlexDirection.COLUMN);
 		addStyle("flex", "1");
-		addStyle("overflow", "hidden");
-		new GSMultiCheckBox(this, ((GSSection) parent).getReverseDirection()) {
+		new GSMultiCheckBox(this, ((GSDiv) parent).getReverseDirection()) {
 			{
 				addStyle("flex", "1");
-				select(gs -> gs[0].getComponents().size() == 2 && !gs[0].isSingularConstraintEnabled(ApiStatics.BASE_POSITION) ? gs[0] : null);
+				select(gs -> gs[0].getComponents().size() == 2 && !gs[0].isSingularConstraintEnabled(gs[0].getComponents().indexOf(gs[2])) ? gs[0] : null);
 			}
 		};
 		new GenericColumn(this) {
 			{
 				addStyle("flex", "1");
-				select(gs -> (gs[0].getComponents().size() != 2 || gs[0].isSingularConstraintEnabled(ApiStatics.BASE_POSITION)) ? gs[0] : null);
+				addStyle("flex-wrap", "wrap");
+				select(gs -> gs[0].getComponents().size() != 2 || gs[0].isSingularConstraintEnabled(gs[0].getComponents().indexOf(gs[2])) ? gs[0] : null);
 				new GSSubcellEditor(this) {
 					{
-						addStyle("flex", "1");
+						addStyle("flex", "1 0 auto");
 						forEach2(model -> BindingsTools.transmitSuccessiveInvalidations(new ListBinding<Generic>() {
 							ObservableList<Generic> holders = ObservableListExtractor.HOLDERS.apply(model.getGenerics());
 							{
@@ -48,7 +48,7 @@ protected ObservableList<Generic> computeValue() {
 				};
 				new GSSubcellEditorWithRemoval(this) {
 					{
-						addStyle("flex", "1");
+						addStyle("flex", "1 0 auto");
 						forEach2(model -> BindingsTools.transmitSuccessiveInvalidations(new ListBinding<Generic>() {
 							ObservableList<Generic> holders = ObservableListExtractor.HOLDERS.apply(model.getGenerics());
 							{
@@ -64,11 +64,15 @@ protected ObservableList<Generic> computeValue() {
 				};
 				new GSSubcellAdder(this) {
 					{
-						select__(model -> Bindings.createObjectBinding(() -> {
+						addStyle("flex", "1 0 auto");
+						select__(model -> {
 							ObservableList<Generic> holders = ObservableListExtractor.HOLDERS.apply(model.getGenerics());
-							return holders.isEmpty() || (model.getGeneric().getComponents().size() < 2 && !model.getGeneric().isPropertyConstraintEnabled())
-									|| (model.getGeneric().getComponents().size() >= 2 && !model.getGeneric().isSingularConstraintEnabled(ApiStatics.BASE_POSITION)) ? model : null;
-						}, ObservableListExtractor.HOLDERS.apply(model.getGenerics())));
+							return Bindings
+									.createObjectBinding(
+											() -> holders.isEmpty() || (model.getGeneric().getComponents().size() < 2 && !model.getGeneric().isPropertyConstraintEnabled())
+													|| (model.getGeneric().getComponents().size() >= 2 && !model.getGeneric().isSingularConstraintEnabled(ApiStatics.BASE_POSITION)) ? model : null,
+											ObservableListExtractor.HOLDERS.apply(model.getGenerics()));
+						});
 					}
 				};
 			}

diff --git a/gs-reactor/src/main/java/org/genericsystem/reactor/gs/GSBooleanHolderEditor.java b/gs-reactor/src/main/java/org/genericsystem/reactor/gs/GSBooleanHolderEditor.java
@@ -1,16 +1,10 @@
 package org.genericsystem.reactor.gs;
 
-import java.io.Serializable;
-
-import javafx.beans.property.Property;
-
-import org.genericsystem.reactor.Context;
 import org.genericsystem.reactor.Tag;
 import org.genericsystem.reactor.gs.GSCheckBoxWithValue.GSCheckBoxEditor;
-import org.genericsystem.reactor.gstag.HtmlHyperLink;
 import org.genericsystem.reactor.modelproperties.GSBuilderDefaults;
 
-public class GSBooleanHolderEditor extends GSSection {
+public class GSBooleanHolderEditor extends GSDiv {
 
 	protected GSCheckBoxWithValue checkbox;
 
@@ -21,7 +15,7 @@ public GSBooleanHolderEditor(Tag parent) {
 	public GSBooleanHolderEditor(Tag parent, GSCheckBoxConstructor constructor) {
 		super(parent, FlexDirection.ROW);
 		addStyle("flex", "1");
-		new GSSection(this, FlexDirection.ROW) {
+		new GSDiv(this, FlexDirection.ROW) {
 			{
 				addStyle("flex", "1");
 				addStyle("justify-content", "center");
@@ -36,45 +30,6 @@ public interface GSCheckBoxConstructor {
 		GSCheckBoxWithValue build(Tag parent);
 	}
 
-	public static class GSBooleanHolderEditorWithRemoval extends GSBooleanHolderEditor {
-
-		public GSBooleanHolderEditorWithRemoval(Tag parent) {
-			super(parent);
-			new HtmlHyperLink(this) {
-				{
-					addStyle("justify-content", "center");
-					addStyle("text-decoration", "none");
-					setText("×");
-					bindAction(Context::remove);
-				}
-			};
-		}
-	}
-
-	public static class GSBooleanHolderAdder extends GSBooleanHolderEditor {
-
-		public GSBooleanHolderAdder(Tag parent) {
-			super(parent, GSCheckBoxWithValue::new);
-			checkbox.addConvertedValueChangeListener((model, nva) -> {
-				if (nva != null)
-					model.getGenerics()[1].addHolder(model.getGeneric(), nva);
-			});
-			new HtmlHyperLink(this) {
-				{
-					addStyle("justify-content", "center");
-					addStyle("text-decoration", "none");
-					setText("+");
-					bindAction(model -> {
-						Property<Serializable> observable = checkbox.getConvertedValueProperty(model);
-						Boolean newValue = (Boolean) observable.getValue();
-						observable.setValue(null);
-						model.getGenerics()[1].addHolder(model.getGeneric(), newValue);
-					});
-				}
-			};
-		}
-	}
-
 	public static class GSBooleanHolderBuilder extends GSBooleanHolderEditor implements GSBuilderDefaults {
 
 		public GSBooleanHolderBuilder(Tag parent) {