Skip to content

Commit

Permalink
merge
Browse files Browse the repository at this point in the history
  • Loading branch information
@nfeybesse
nfeybesse committed Aug 24, 2016
1 parent 1ff98f8 commit 2bf68ef
Show file tree
Hide file tree
Showing 66 changed files with 325 additions and 846 deletions.
40 changes: 19 additions & 21 deletions gs-carcolor/src/main/java/org/genericsystem/carcolor/GSUserGuide.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@
import org.genericsystem.reactor.gs.FlexDirection;
import org.genericsystem.reactor.gs.GSSection;
import org.genericsystem.reactor.gs.GSTag;
import org.genericsystem.reactor.gstag.GSButton;
import org.genericsystem.reactor.gstag.GSLi;
import org.genericsystem.reactor.gstag.GSUl;
import org.genericsystem.reactor.html.HtmlHyperLink;
import org.genericsystem.reactor.model.GenericModel;
import org.genericsystem.reactor.gstag.GSModalButton;
import org.genericsystem.reactor.gstag.HtmlHyperLink;
import org.genericsystem.reactor.gstag.HtmlLi;
import org.genericsystem.reactor.gstag.HtmlUl;

public class GSUserGuide extends GSSection {

Expand All @@ -20,55 +19,54 @@ public GSUserGuide(GSTag parent) {

GSSection gSection = new GSSection(this, FlexDirection.COLUMN) {
{

addStyleClass("modal");
createNewInitializedProperty(ReactorStatics.DISPLAY, model -> "none");
bindStyle(ReactorStatics.DISPLAY, ReactorStatics.DISPLAY);
new GSSection(this, FlexDirection.COLUMN) {
{
addStyle("max-width", "40%");
addStyleClass("modal-content");
new HtmlHyperLink<GenericModel>(this) {
new HtmlHyperLink(this) {
{
addStyleClass("close");
setText("×");
bindAction(model -> {
this.getParent().getProperty(ReactorStatics.DISPLAY, model).setValue("none");
getProperty(ReactorStatics.DISPLAY, model).setValue("none");
});
}
};
new GSSection(this, FlexDirection.COLUMN) {
{
setText("How to use CarColor Demo");
new GSUl(this) {
new HtmlUl(this) {
{
setText("Car(s) Managment");
GSLi li1 = new GSLi(this);
GSLi li2 = new GSLi(this);
GSLi li3 = new GSLi(this);
HtmlLi li1 = new HtmlLi(this);
HtmlLi li2 = new HtmlLi(this);
HtmlLi li3 = new HtmlLi(this);
li1.setText("Insert Car model");
li2.setText("Select color in the ComboBox");
li3.setText("Use \"add Button\" to update data");
}
};
new GSUl(this) {
new HtmlUl(this) {
{
setText("Color Managment");
GSLi li1 = new GSLi(this);
GSLi li2 = new GSLi(this);
GSLi li3 = new GSLi(this);
HtmlLi li1 = new HtmlLi(this);
HtmlLi li2 = new HtmlLi(this);
HtmlLi li3 = new HtmlLi(this);
li1.setText("Add new color");
li2.setText("Select car in the ComboBox");
li3.setText("Use \"add Button\" to update data");
}
};
new GSUl(this) {
new HtmlUl(this) {
{
setText("General Tips");
GSLi li1 = new GSLi(this);
GSLi li2 = new GSLi(this);
GSLi li3 = new GSLi(this);
GSLi li4 = new GSLi(this);
HtmlLi li1 = new HtmlLi(this);
HtmlLi li2 = new HtmlLi(this);
HtmlLi li3 = new HtmlLi(this);
HtmlLi li4 = new HtmlLi(this);
li1.setText("Click \"Add Button\" to add an entry in the cache");
li2.setText("Click the \"Remove Button\" to delete the entry in your cache");
li3.setText("Click \"Save Button\" to persist the cache");
Expand Down
9 changes: 5 additions & 4 deletions gs-carcolor/src/main/resources/carcolorapp.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,10 +176,11 @@ function selectIndex(name){
}

window.onclick = function(event) {
var modal = document.getElementsByClassName("modal")[0];
if (event.target == modal) {
if(modal.style.display != "none") {
document.getElementsByClassName("close")[0].click();
var modal = document.getElementsByClassName("modal");
var i;
for (i=0; i < modal.length; i++){
if(modal[i].style.display == "flex") {
document.getElementsByClassName("close")[i].click();
}
}
}
136 changes: 43 additions & 93 deletions gs-defaults/src/main/java/org/genericsystem/defaults/DefaultCompositesInheritance.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,6 @@
import java.util.stream.Collectors;
import java.util.stream.Stream;

import javafx.beans.binding.Bindings;
import javafx.beans.binding.ListBinding;
import javafx.beans.binding.ObjectBinding;
import javafx.beans.value.ObservableValue;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;

import org.genericsystem.api.core.ApiStatics;
import org.genericsystem.api.core.IGeneric;
import org.genericsystem.api.core.Snapshot;
Expand All @@ -24,6 +17,13 @@

import com.sun.javafx.collections.ObservableListWrapper;

import javafx.beans.binding.Binding;
import javafx.beans.binding.Bindings;
import javafx.beans.binding.ListBinding;
import javafx.beans.value.ObservableValue;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;

/**
* @author Nicolas Feybesse
*
Expand All @@ -37,6 +37,12 @@ public interface DefaultCompositesInheritance<T extends DefaultGeneric<T>> exten

//

static <U> Binding<U> transmitSuccessiveInvalidations(Binding<U> binding) {
binding.addListener((o, v, nv) -> {
});
return binding;
}

@SuppressWarnings("unchecked")
@Override
default T getAttribute(Serializable value, T... targets) {
Expand All @@ -45,7 +51,7 @@ default T getAttribute(Serializable value, T... targets) {

@SuppressWarnings("unchecked")
default ObservableValue<T> getObservableAttribute(Serializable value, T... targets) {
return Bindings.valueAt(getObservableAttributes(value, targets), 0);
return transmitSuccessiveInvalidations(Bindings.valueAt(getObservableAttributes(value, targets), 0));
}

@SuppressWarnings("unchecked")
Expand All @@ -56,7 +62,7 @@ default T getAttribute(T... targets) {

@SuppressWarnings("unchecked")
default ObservableValue<T> getObservableAttribute(T... targets) {
return Bindings.valueAt(getObservableAttributes(targets), 0);
return transmitSuccessiveInvalidations(Bindings.valueAt(getObservableAttributes(targets), 0));
}

@SuppressWarnings("unchecked")
Expand Down Expand Up @@ -126,7 +132,7 @@ default T getHolder(T attribute, Serializable value, T... targets) {

@SuppressWarnings("unchecked")
default ObservableValue<T> getObservableHolder(T attribute, Serializable value, T... targets) {
return Bindings.valueAt(getObservableHolders(attribute, value, targets), 0);
return transmitSuccessiveInvalidations(Bindings.valueAt(getObservableHolders(attribute, value, targets), 0));
}

@SuppressWarnings("unchecked")
Expand All @@ -137,32 +143,7 @@ default T getHolder(T attribute, T... targets) {

@SuppressWarnings("unchecked")
default ObservableValue<T> getObservableHolder(T attribute, T... targets) {
return Bindings.valueAt(getObservableHolders(attribute, targets), 0);
// return new ObjectBinding<T>() {
//
//
// private final ObservableList<T> strongref = getObservableHolders(attribute, targets);
//
// {
// bind(strongref);
// }
//
// @Override
// protected T computeValue() {
// return getHolders(attribute, targets).first();
// }
//
// @Override
// protected void finalize() throws Throwable {
// System.out.println("FINALIZE");
// }
//
// @Override
// public ObservableList<?> getDependencies() {
// return FXCollections.singletonObservableList(strongref);
// }
// };
// Bindings.createObjectBinding(() -> getHolders(attribute, targets).first(), getObservableHolders(attribute, targets));// Bindings.valueAt(getObservableHolders(attribute, targets), 0);
return transmitSuccessiveInvalidations(Bindings.valueAt(getObservableHolders(attribute, targets), 0));
}

@SuppressWarnings("unchecked")
Expand Down Expand Up @@ -223,7 +204,7 @@ default T getRelation(Serializable value, T... targets) {

@SuppressWarnings("unchecked")
default ObservableValue<T> getObservableRelation(Serializable value, T... targets) {
return Bindings.valueAt(getObservableRelations(value, targets), 0);
return transmitSuccessiveInvalidations(Bindings.valueAt(getObservableRelations(value, targets), 0));
}

@SuppressWarnings("unchecked")
Expand All @@ -234,7 +215,7 @@ default T getRelation(T... targets) {

@SuppressWarnings("unchecked")
default ObservableValue<T> getObservableRelation(T... targets) {
return Bindings.valueAt(getObservableRelations(targets), 0);
return transmitSuccessiveInvalidations(Bindings.valueAt(getObservableRelations(targets), 0));
}

@SuppressWarnings("unchecked")
Expand Down Expand Up @@ -289,7 +270,7 @@ default T getLink(T relation, Serializable value, T... targets) {

@SuppressWarnings("unchecked")
default ObservableValue<T> getObservableLink(T relation, Serializable value, T... targets) {
return Bindings.valueAt(getObservableLinks(relation, value, targets), 0);
return transmitSuccessiveInvalidations(Bindings.valueAt(getObservableLinks(relation, value, targets), 0));
}

@SuppressWarnings("unchecked")
Expand All @@ -300,7 +281,7 @@ default T getLink(T relation, T... targets) {

@SuppressWarnings("unchecked")
default ObservableValue<T> getObservableLink(T relation, T... targets) {
return Bindings.valueAt(getObservableLinks(relation, targets), 0);
return transmitSuccessiveInvalidations(Bindings.valueAt(getObservableLinks(relation, targets), 0));
}

@SuppressWarnings("unchecked")
Expand Down Expand Up @@ -356,18 +337,10 @@ default Serializable getValue(T attribute, Serializable value, T... targets) {

@SuppressWarnings("unchecked")
default ObservableValue<Serializable> getObservableValue(T attribute, Serializable value, T... targets) {
return new ObjectBinding<Serializable>() {
private final ObservableValue<T> holder;
{
holder = getObservableHolder(attribute, value, targets);
bind(holder);
}

@Override
protected Serializable computeValue() {
return holder.getValue() != null ? holder.getValue().getValue() : null;
}
};
return transmitSuccessiveInvalidations(Bindings.createObjectBinding(() -> {
ObservableValue<T> holder = getObservableHolder(attribute, value, targets);
return holder.getValue() != null ? holder.getValue().getValue() : null;
}, getObservableHolder(attribute, value, targets)));
}

@SuppressWarnings("unchecked")
Expand All @@ -379,18 +352,10 @@ default Serializable getValue(T attribute, T... targets) {

@SuppressWarnings("unchecked")
default ObservableValue<Serializable> getObservableValue(T attribute, T... targets) {
return new ObjectBinding<Serializable>() {
private final ObservableValue<T> holder;
{
holder = getObservableHolder(attribute, targets);
bind(holder);
}

@Override
protected Serializable computeValue() {
return holder.getValue() != null ? holder.getValue().getValue() : null;
}
};
return transmitSuccessiveInvalidations(Bindings.createObjectBinding(() -> {
ObservableValue<T> holder = getObservableHolder(attribute, targets);
return holder.getValue() != null ? holder.getValue().getValue() : null;
}, getObservableHolder(attribute, targets)));
}

@SuppressWarnings("unchecked")
Expand All @@ -401,8 +366,7 @@ default Snapshot<Serializable> getValues(T attribute, Serializable value, T... t

@SuppressWarnings("unchecked")
default ObservableList<Serializable> getObservableValues(T attribute, Serializable value, T... targets) {
// TODO test
return new ListBinding<Serializable>() {
return (ListBinding<Serializable>) transmitSuccessiveInvalidations(new ListBinding<Serializable>() {
private final ObservableList<T> links = getObservableLinks(attribute, value, targets);
{
bind(links);
Expand All @@ -412,7 +376,7 @@ default ObservableList<Serializable> getObservableValues(T attribute, Serializab
protected ObservableList<Serializable> computeValue() {
return FXCollections.unmodifiableObservableList(new ObservableListWrapper<>(links.stream().map(x -> x.getValue()).collect(Collectors.toList())));
}
};
});
}

@SuppressWarnings("unchecked")
Expand All @@ -423,7 +387,7 @@ default Snapshot<Serializable> getValues(T attribute, T... targets) {

@SuppressWarnings("unchecked")
default ObservableList<Serializable> getObservableValues(T attribute, T... targets) {
return new ListBinding<Serializable>() {
return (ListBinding<Serializable>) transmitSuccessiveInvalidations(new ListBinding<Serializable>() {
private final ObservableList<T> links = getObservableLinks(attribute, targets);
{
bind(links);
Expand All @@ -433,7 +397,7 @@ default ObservableList<Serializable> getObservableValues(T attribute, T... targe
protected ObservableList<Serializable> computeValue() {
return FXCollections.unmodifiableObservableList(new ObservableListWrapper<>(links.stream().map(x -> x.getValue()).collect(Collectors.toList())));
}
};
});
}

@Override
Expand All @@ -442,7 +406,7 @@ default Snapshot<Serializable> getValues(T attribute, int pos) {
}

default ObservableList<Serializable> getObservableValues(T attribute, int pos) {
return new ListBinding<Serializable>() {
return (ListBinding<Serializable>) transmitSuccessiveInvalidations(new ListBinding<Serializable>() {
private final ObservableList<T> holders = getObservableHolders(attribute, pos);
{
bind(holders);
Expand All @@ -452,7 +416,7 @@ default ObservableList<Serializable> getObservableValues(T attribute, int pos) {
protected ObservableList<Serializable> computeValue() {
return FXCollections.unmodifiableObservableList(new ObservableListWrapper<>(holders.stream().map(x -> x.getValue()).collect(Collectors.toList())));
}
};
});
}

@SuppressWarnings("unchecked")
Expand Down Expand Up @@ -480,17 +444,10 @@ default T getLinkTargetComponent(T relation, T... targets) {

@SuppressWarnings("unchecked")
default ObservableValue<T> getObservableLinkTargetComponent(T relation, T... targets) {
return new ObjectBinding<T>() {
private final ObservableValue<T> link = getObservableLink(relation, targets);
{
bind(link);
}

@Override
protected T computeValue() {
return link.getValue() != null ? link.getValue().getTargetComponent() : null;
}
};
return transmitSuccessiveInvalidations(Bindings.createObjectBinding(() -> {
ObservableValue<T> link = getObservableLink(relation, targets);
return link.getValue() != null ? link.getValue().getTargetComponent() : null;
}, getObservableLink(relation, targets)));
}

@SuppressWarnings("unchecked")
Expand All @@ -501,16 +458,9 @@ default T getLinkTargetComponent(T relation, Serializable value, T... targets) {

@SuppressWarnings("unchecked")
default ObservableValue<T> getObservablecLinkTargetComponent(T relation, Serializable value, T... targets) {
return new ObjectBinding<T>() {
private final ObservableValue<T> link = getObservableLink(relation, value, targets);
{
bind(link);
}

@Override
protected T computeValue() {
return link.getValue() != null ? link.getValue().getTargetComponent() : null;
}
};
return transmitSuccessiveInvalidations(Bindings.createObjectBinding(() -> {
ObservableValue<T> link = getObservableLink(relation, value, targets);
return link.getValue() != null ? link.getValue().getTargetComponent() : null;
}, getObservableLink(relation, value, targets)));
}
}
1 change: 0 additions & 1 deletion ...efaults/src/main/java/org/genericsystem/defaults/tools/ObservableListWrapperExtended.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ public ObservableListWrapperExtended(ObservableList<E> external, Callback<E, Obs

@Override
public void onChanged(Change<? extends E> change) {
System.out.println("------------- onChange dans ObservableListWrapperExtended");
while (change.next()) {
beginChange();
if (change.wasPermutated()) {
Expand Down
Loading

0 comments on commit 2bf68ef

Please sign in to comment.