diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-03-18 18:43:48 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-03-18 18:43:48 +0200 |
| commit | 96352ac46ccb871783c63fd98efe034091214b7e (patch) | |
| tree | c8e0893784457974a8e005d27573e0c3b285f2d9 | |
| parent | 4f4b5f052200fde6ccc6aa06094904cf9bf3106b (diff) | |
| download | Tango-96352ac46ccb871783c63fd98efe034091214b7e.tar.gz Tango-96352ac46ccb871783c63fd98efe034091214b7e.zip | |
Make android DAL observable !
74 files changed, 1294 insertions, 342 deletions
diff --git a/Software/Android_Studio/Tango.DAL/build.gradle b/Software/Android_Studio/Tango.DAL/build.gradle index fdc899b3a..261c3b528 100644 --- a/Software/Android_Studio/Tango.DAL/build.gradle +++ b/Software/Android_Studio/Tango.DAL/build.gradle @@ -25,6 +25,10 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + + dataBinding { + enabled = true + } } def dbflow_version = "4.1.2" diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/Entity.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/Entity.java index 84b88535a..a785d3d4c 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/Entity.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/Entity.java @@ -1,5 +1,9 @@ package com.twine.tango.dal; +import android.databinding.Bindable; +import android.databinding.Observable; +import android.databinding.PropertyChangeRegistry; + import com.raizlabs.android.dbflow.annotation.Column; import com.raizlabs.android.dbflow.annotation.PrimaryKey; import com.raizlabs.android.dbflow.rx2.structure.BaseRXModel; @@ -16,8 +20,10 @@ import io.reactivex.Single; * Represents a DAL base entity. * contains the basic columns/properties which are in common to all entities. */ -public class Entity extends BaseRXModel +public class Entity extends BaseRXModel implements Observable { + private transient PropertyChangeRegistry mCallbacks; + @Column(name = "ID") private int id; @@ -98,6 +104,54 @@ public class Entity extends BaseRXModel } @Override + public void addOnPropertyChangedCallback(OnPropertyChangedCallback callback) { + synchronized (this) { + if (mCallbacks == null) { + mCallbacks = new PropertyChangeRegistry(); + } + } + mCallbacks.add(callback); + } + + @Override + public void removeOnPropertyChangedCallback(OnPropertyChangedCallback callback) { + synchronized (this) { + if (mCallbacks == null) { + return; + } + } + mCallbacks.remove(callback); + } + + /** + * Notifies listeners that all properties of this instance have changed. + */ + public void notifyChange() { + synchronized (this) { + if (mCallbacks == null) { + return; + } + } + mCallbacks.notifyCallbacks(this, 0, null); + } + + /** + * Notifies listeners that a specific property has changed. The getter for the property + * that changes should be marked with {@link Bindable} to generate a field in + * <code>BR</code> to be used as <code>fieldId</code>. + * + * @param fieldId The generated BR id for the Bindable field. + */ + public void notifyPropertyChanged(int fieldId) { + synchronized (this) { + if (mCallbacks == null) { + return; + } + } + mCallbacks.notifyCallbacks(this, fieldId, null); + } + + @Override public Single<Boolean> save() { setLast_updated(DateTime.now(DateTimeZone.UTC)); diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ActionType.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ActionType.java index adf82e056..96d07a193 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ActionType.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ActionType.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "ACTION_TYPES", database = TangoDB.class) @@ -34,6 +36,7 @@ import com.twine.tango.dal.TangoDB; * * return the Code */ + @Bindable public int getCode() { return code; @@ -47,6 +50,7 @@ import com.twine.tango.dal.TangoDB; public void setCode(int code) { this.code = code; + notifyPropertyChanged(BR.code); } @@ -55,6 +59,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -68,6 +73,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } @@ -76,6 +82,7 @@ import com.twine.tango.dal.TangoDB; * * return the Description */ + @Bindable public String getDescription() { return description; @@ -89,6 +96,7 @@ import com.twine.tango.dal.TangoDB; public void setDescription(String description) { this.description = description; + notifyPropertyChanged(BR.description); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Address.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Address.java index 7a2a9242f..0677b48b7 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Address.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Address.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "ADDRESSES", database = TangoDB.class) @@ -14,7 +16,7 @@ import com.twine.tango.dal.TangoDB; { @Column(name = "DELETED") - private Boolean deleted; + private boolean deleted; @@ -59,7 +61,8 @@ import com.twine.tango.dal.TangoDB; * * return the Deleted */ - public Boolean isDeleted() + @Bindable + public boolean isDeleted() { return deleted; } @@ -69,9 +72,10 @@ import com.twine.tango.dal.TangoDB; * * @param deleted the Deleted */ - public void setDeleted(Boolean deleted) + public void setDeleted(boolean deleted) { this.deleted = deleted; + notifyPropertyChanged(BR.deleted); } @@ -80,6 +84,7 @@ import com.twine.tango.dal.TangoDB; * * return the AddressString */ + @Bindable public String getAddressString() { return addressString; @@ -93,6 +98,7 @@ import com.twine.tango.dal.TangoDB; public void setAddressString(String addressString) { this.addressString = addressString; + notifyPropertyChanged(BR.addressString); } @@ -101,6 +107,7 @@ import com.twine.tango.dal.TangoDB; * * return the Locality */ + @Bindable public String getLocality() { return locality; @@ -114,6 +121,7 @@ import com.twine.tango.dal.TangoDB; public void setLocality(String locality) { this.locality = locality; + notifyPropertyChanged(BR.locality); } @@ -122,6 +130,7 @@ import com.twine.tango.dal.TangoDB; * * return the Country */ + @Bindable public String getCountry() { return country; @@ -135,6 +144,7 @@ import com.twine.tango.dal.TangoDB; public void setCountry(String country) { this.country = country; + notifyPropertyChanged(BR.country); } @@ -143,6 +153,7 @@ import com.twine.tango.dal.TangoDB; * * return the City */ + @Bindable public String getCity() { return city; @@ -156,6 +167,7 @@ import com.twine.tango.dal.TangoDB; public void setCity(String city) { this.city = city; + notifyPropertyChanged(BR.city); } @@ -164,6 +176,7 @@ import com.twine.tango.dal.TangoDB; * * return the State */ + @Bindable public String getState() { return state; @@ -177,6 +190,7 @@ import com.twine.tango.dal.TangoDB; public void setState(String state) { this.state = state; + notifyPropertyChanged(BR.state); } @@ -185,6 +199,7 @@ import com.twine.tango.dal.TangoDB; * * return the CountryCode */ + @Bindable public String getCountryCode() { return countryCode; @@ -198,6 +213,7 @@ import com.twine.tango.dal.TangoDB; public void setCountryCode(String countryCode) { this.countryCode = countryCode; + notifyPropertyChanged(BR.countryCode); } @@ -206,6 +222,7 @@ import com.twine.tango.dal.TangoDB; * * return the PostalCode */ + @Bindable public String getPostalCode() { return postalCode; @@ -219,6 +236,7 @@ import com.twine.tango.dal.TangoDB; public void setPostalCode(String postalCode) { this.postalCode = postalCode; + notifyPropertyChanged(BR.postalCode); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationDisplayPanelVersion.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationDisplayPanelVersion.java index d046d063f..ba33c8331 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationDisplayPanelVersion.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationDisplayPanelVersion.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "APPLICATION_DISPLAY_PANEL_VERSIONS", database = TangoDB.class) @@ -14,7 +16,7 @@ import com.twine.tango.dal.TangoDB; { @Column(name = "VERSION") - private Double version; + private double version; @@ -29,7 +31,8 @@ import com.twine.tango.dal.TangoDB; * * return the Version */ - public Double getVersion() + @Bindable + public double getVersion() { return version; } @@ -39,9 +42,10 @@ import com.twine.tango.dal.TangoDB; * * @param version the Version */ - public void setVersion(Double version) + public void setVersion(double version) { this.version = version; + notifyPropertyChanged(BR.version); } @@ -50,6 +54,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -63,6 +68,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationFirmwareVersion.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationFirmwareVersion.java index 6a417c5c0..79efb9112 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationFirmwareVersion.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationFirmwareVersion.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "APPLICATION_FIRMWARE_VERSIONS", database = TangoDB.class) @@ -14,7 +16,7 @@ import com.twine.tango.dal.TangoDB; { @Column(name = "VERSION") - private Double version; + private double version; @@ -29,7 +31,8 @@ import com.twine.tango.dal.TangoDB; * * return the Version */ - public Double getVersion() + @Bindable + public double getVersion() { return version; } @@ -39,9 +42,10 @@ import com.twine.tango.dal.TangoDB; * * @param version the Version */ - public void setVersion(Double version) + public void setVersion(double version) { this.version = version; + notifyPropertyChanged(BR.version); } @@ -50,6 +54,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -63,6 +68,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationOsVersion.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationOsVersion.java index 0b443a664..01205ca45 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationOsVersion.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationOsVersion.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "APPLICATION_OS_VERSIONS", database = TangoDB.class) @@ -14,7 +16,7 @@ import com.twine.tango.dal.TangoDB; { @Column(name = "VERSION") - private Double version; + private double version; @@ -29,7 +31,8 @@ import com.twine.tango.dal.TangoDB; * * return the Version */ - public Double getVersion() + @Bindable + public double getVersion() { return version; } @@ -39,9 +42,10 @@ import com.twine.tango.dal.TangoDB; * * @param version the Version */ - public void setVersion(Double version) + public void setVersion(double version) { this.version = version; + notifyPropertyChanged(BR.version); } @@ -50,6 +54,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -63,6 +68,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationVersion.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationVersion.java index 05c7e75b5..55a393a8b 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationVersion.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationVersion.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "APPLICATION_VERSIONS", database = TangoDB.class) @@ -14,7 +16,7 @@ import com.twine.tango.dal.TangoDB; { @Column(name = "VERSION") - private Double version; + private double version; @@ -29,7 +31,8 @@ import com.twine.tango.dal.TangoDB; * * return the Version */ - public Double getVersion() + @Bindable + public double getVersion() { return version; } @@ -39,9 +42,10 @@ import com.twine.tango.dal.TangoDB; * * @param version the Version */ - public void setVersion(Double version) + public void setVersion(double version) { this.version = version; + notifyPropertyChanged(BR.version); } @@ -50,6 +54,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -63,6 +68,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/BrushStop.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/BrushStop.java index 3801da548..c94c7b884 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/BrushStop.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/BrushStop.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "BRUSH_STOPS", database = TangoDB.class) @@ -14,7 +16,7 @@ import com.twine.tango.dal.TangoDB; { @Column(name = "OFFSET_PERCENT") - private Double offsetPercent; + private double offsetPercent; @@ -24,22 +26,22 @@ import com.twine.tango.dal.TangoDB; @Column(name = "CYAN") - private Double cyan; + private double cyan; @Column(name = "MAGENTA") - private Double magenta; + private double magenta; @Column(name = "YELLOW") - private Double yellow; + private double yellow; @Column(name = "BLACK") - private Double black; + private double black; @@ -59,57 +61,57 @@ import com.twine.tango.dal.TangoDB; @Column(name = "L") - private Double l; + private double l; @Column(name = "A") - private Double a; + private double a; @Column(name = "B") - private Double b; + private double b; @Column(name = "V0") - private Double v0; + private double v0; @Column(name = "V1") - private Double v1; + private double v1; @Column(name = "V2") - private Double v2; + private double v2; @Column(name = "V3") - private Double v3; + private double v3; @Column(name = "V4") - private Double v4; + private double v4; @Column(name = "V5") - private Double v5; + private double v5; @Column(name = "V6") - private Double v6; + private double v6; @Column(name = "V7") - private Double v7; + private double v7; @@ -139,7 +141,8 @@ import com.twine.tango.dal.TangoDB; * * return the OffsetPercent */ - public Double getOffsetPercent() + @Bindable + public double getOffsetPercent() { return offsetPercent; } @@ -149,9 +152,10 @@ import com.twine.tango.dal.TangoDB; * * @param offsetPercent the OffsetPercent */ - public void setOffsetPercent(Double offsetPercent) + public void setOffsetPercent(double offsetPercent) { this.offsetPercent = offsetPercent; + notifyPropertyChanged(BR.offsetPercent); } @@ -160,6 +164,7 @@ import com.twine.tango.dal.TangoDB; * * return the StopIndex */ + @Bindable public int getStopIndex() { return stopIndex; @@ -173,6 +178,7 @@ import com.twine.tango.dal.TangoDB; public void setStopIndex(int stopIndex) { this.stopIndex = stopIndex; + notifyPropertyChanged(BR.stopIndex); } @@ -181,7 +187,8 @@ import com.twine.tango.dal.TangoDB; * * return the Cyan */ - public Double getCyan() + @Bindable + public double getCyan() { return cyan; } @@ -191,9 +198,10 @@ import com.twine.tango.dal.TangoDB; * * @param cyan the Cyan */ - public void setCyan(Double cyan) + public void setCyan(double cyan) { this.cyan = cyan; + notifyPropertyChanged(BR.cyan); } @@ -202,7 +210,8 @@ import com.twine.tango.dal.TangoDB; * * return the Magenta */ - public Double getMagenta() + @Bindable + public double getMagenta() { return magenta; } @@ -212,9 +221,10 @@ import com.twine.tango.dal.TangoDB; * * @param magenta the Magenta */ - public void setMagenta(Double magenta) + public void setMagenta(double magenta) { this.magenta = magenta; + notifyPropertyChanged(BR.magenta); } @@ -223,7 +233,8 @@ import com.twine.tango.dal.TangoDB; * * return the Yellow */ - public Double getYellow() + @Bindable + public double getYellow() { return yellow; } @@ -233,9 +244,10 @@ import com.twine.tango.dal.TangoDB; * * @param yellow the Yellow */ - public void setYellow(Double yellow) + public void setYellow(double yellow) { this.yellow = yellow; + notifyPropertyChanged(BR.yellow); } @@ -244,7 +256,8 @@ import com.twine.tango.dal.TangoDB; * * return the Black */ - public Double getBlack() + @Bindable + public double getBlack() { return black; } @@ -254,9 +267,10 @@ import com.twine.tango.dal.TangoDB; * * @param black the Black */ - public void setBlack(Double black) + public void setBlack(double black) { this.black = black; + notifyPropertyChanged(BR.black); } @@ -265,6 +279,7 @@ import com.twine.tango.dal.TangoDB; * * return the Red */ + @Bindable public int getRed() { return red; @@ -278,6 +293,7 @@ import com.twine.tango.dal.TangoDB; public void setRed(int red) { this.red = red; + notifyPropertyChanged(BR.red); } @@ -286,6 +302,7 @@ import com.twine.tango.dal.TangoDB; * * return the Green */ + @Bindable public int getGreen() { return green; @@ -299,6 +316,7 @@ import com.twine.tango.dal.TangoDB; public void setGreen(int green) { this.green = green; + notifyPropertyChanged(BR.green); } @@ -307,6 +325,7 @@ import com.twine.tango.dal.TangoDB; * * return the Blue */ + @Bindable public int getBlue() { return blue; @@ -320,6 +339,7 @@ import com.twine.tango.dal.TangoDB; public void setBlue(int blue) { this.blue = blue; + notifyPropertyChanged(BR.blue); } @@ -328,7 +348,8 @@ import com.twine.tango.dal.TangoDB; * * return the L */ - public Double getL() + @Bindable + public double getL() { return l; } @@ -338,9 +359,10 @@ import com.twine.tango.dal.TangoDB; * * @param l the L */ - public void setL(Double l) + public void setL(double l) { this.l = l; + notifyPropertyChanged(BR.l); } @@ -349,7 +371,8 @@ import com.twine.tango.dal.TangoDB; * * return the A */ - public Double getA() + @Bindable + public double getA() { return a; } @@ -359,9 +382,10 @@ import com.twine.tango.dal.TangoDB; * * @param a the A */ - public void setA(Double a) + public void setA(double a) { this.a = a; + notifyPropertyChanged(BR.a); } @@ -370,7 +394,8 @@ import com.twine.tango.dal.TangoDB; * * return the B */ - public Double getB() + @Bindable + public double getB() { return b; } @@ -380,9 +405,10 @@ import com.twine.tango.dal.TangoDB; * * @param b the B */ - public void setB(Double b) + public void setB(double b) { this.b = b; + notifyPropertyChanged(BR.b); } @@ -391,7 +417,8 @@ import com.twine.tango.dal.TangoDB; * * return the V0 */ - public Double getV0() + @Bindable + public double getV0() { return v0; } @@ -401,9 +428,10 @@ import com.twine.tango.dal.TangoDB; * * @param v0 the V0 */ - public void setV0(Double v0) + public void setV0(double v0) { this.v0 = v0; + notifyPropertyChanged(BR.v0); } @@ -412,7 +440,8 @@ import com.twine.tango.dal.TangoDB; * * return the V1 */ - public Double getV1() + @Bindable + public double getV1() { return v1; } @@ -422,9 +451,10 @@ import com.twine.tango.dal.TangoDB; * * @param v1 the V1 */ - public void setV1(Double v1) + public void setV1(double v1) { this.v1 = v1; + notifyPropertyChanged(BR.v1); } @@ -433,7 +463,8 @@ import com.twine.tango.dal.TangoDB; * * return the V2 */ - public Double getV2() + @Bindable + public double getV2() { return v2; } @@ -443,9 +474,10 @@ import com.twine.tango.dal.TangoDB; * * @param v2 the V2 */ - public void setV2(Double v2) + public void setV2(double v2) { this.v2 = v2; + notifyPropertyChanged(BR.v2); } @@ -454,7 +486,8 @@ import com.twine.tango.dal.TangoDB; * * return the V3 */ - public Double getV3() + @Bindable + public double getV3() { return v3; } @@ -464,9 +497,10 @@ import com.twine.tango.dal.TangoDB; * * @param v3 the V3 */ - public void setV3(Double v3) + public void setV3(double v3) { this.v3 = v3; + notifyPropertyChanged(BR.v3); } @@ -475,7 +509,8 @@ import com.twine.tango.dal.TangoDB; * * return the V4 */ - public Double getV4() + @Bindable + public double getV4() { return v4; } @@ -485,9 +520,10 @@ import com.twine.tango.dal.TangoDB; * * @param v4 the V4 */ - public void setV4(Double v4) + public void setV4(double v4) { this.v4 = v4; + notifyPropertyChanged(BR.v4); } @@ -496,7 +532,8 @@ import com.twine.tango.dal.TangoDB; * * return the V5 */ - public Double getV5() + @Bindable + public double getV5() { return v5; } @@ -506,9 +543,10 @@ import com.twine.tango.dal.TangoDB; * * @param v5 the V5 */ - public void setV5(Double v5) + public void setV5(double v5) { this.v5 = v5; + notifyPropertyChanged(BR.v5); } @@ -517,7 +555,8 @@ import com.twine.tango.dal.TangoDB; * * return the V6 */ - public Double getV6() + @Bindable + public double getV6() { return v6; } @@ -527,9 +566,10 @@ import com.twine.tango.dal.TangoDB; * * @param v6 the V6 */ - public void setV6(Double v6) + public void setV6(double v6) { this.v6 = v6; + notifyPropertyChanged(BR.v6); } @@ -538,7 +578,8 @@ import com.twine.tango.dal.TangoDB; * * return the V7 */ - public Double getV7() + @Bindable + public double getV7() { return v7; } @@ -548,9 +589,10 @@ import com.twine.tango.dal.TangoDB; * * @param v7 the V7 */ - public void setV7(Double v7) + public void setV7(double v7) { this.v7 = v7; + notifyPropertyChanged(BR.v7); } @@ -559,6 +601,7 @@ import com.twine.tango.dal.TangoDB; * * return the ColorCatalogCode */ + @Bindable public int getColorCatalogCode() { return colorCatalogCode; @@ -572,6 +615,7 @@ import com.twine.tango.dal.TangoDB; public void setColorCatalogCode(int colorCatalogCode) { this.colorCatalogCode = colorCatalogCode; + notifyPropertyChanged(BR.colorCatalogCode); } @@ -580,6 +624,7 @@ import com.twine.tango.dal.TangoDB; * * return the ColorCatalogs */ + @Bindable public ColorCatalog getColorCatalogs() { return colorCatalogs; @@ -593,6 +638,7 @@ import com.twine.tango.dal.TangoDB; public void setColorCatalogs(ColorCatalog colorCatalogs) { this.colorCatalogs = colorCatalogs; + notifyPropertyChanged(BR.colorCatalogs); } @@ -601,6 +647,7 @@ import com.twine.tango.dal.TangoDB; * * return the ColorSpaces */ + @Bindable public ColorSpace getColorSpaces() { return colorSpaces; @@ -614,6 +661,7 @@ import com.twine.tango.dal.TangoDB; public void setColorSpaces(ColorSpace colorSpaces) { this.colorSpaces = colorSpaces; + notifyPropertyChanged(BR.colorSpaces); } @@ -622,6 +670,7 @@ import com.twine.tango.dal.TangoDB; * * return the Segment */ + @Bindable public Segment getSegment() { return segment; @@ -635,6 +684,7 @@ import com.twine.tango.dal.TangoDB; public void setSegment(Segment segment) { this.segment = segment; + notifyPropertyChanged(BR.segment); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/CartridgeType.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/CartridgeType.java index 1153665ea..891085433 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/CartridgeType.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/CartridgeType.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "CARTRIDGE_TYPES", database = TangoDB.class) @@ -29,6 +31,7 @@ import com.twine.tango.dal.TangoDB; * * return the Code */ + @Bindable public int getCode() { return code; @@ -42,6 +45,7 @@ import com.twine.tango.dal.TangoDB; public void setCode(int code) { this.code = code; + notifyPropertyChanged(BR.code); } @@ -50,6 +54,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -63,6 +68,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Cat.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Cat.java index 6f434a042..878bb3139 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Cat.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Cat.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "CATS", database = TangoDB.class) @@ -44,6 +46,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -57,6 +60,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } @@ -65,6 +69,7 @@ import com.twine.tango.dal.TangoDB; * * return the Data */ + @Bindable public byte[] getData() { return data; @@ -78,6 +83,7 @@ import com.twine.tango.dal.TangoDB; public void setData(byte[] data) { this.data = data; + notifyPropertyChanged(BR.data); } @@ -86,6 +92,7 @@ import com.twine.tango.dal.TangoDB; * * return the LiquidTypes */ + @Bindable public LiquidType getLiquidTypes() { return liquidTypes; @@ -99,6 +106,7 @@ import com.twine.tango.dal.TangoDB; public void setLiquidTypes(LiquidType liquidTypes) { this.liquidTypes = liquidTypes; + notifyPropertyChanged(BR.liquidTypes); } @@ -107,6 +115,7 @@ import com.twine.tango.dal.TangoDB; * * return the Machine */ + @Bindable public Machine getMachine() { return machine; @@ -120,6 +129,7 @@ import com.twine.tango.dal.TangoDB; public void setMachine(Machine machine) { this.machine = machine; + notifyPropertyChanged(BR.machine); } @@ -128,6 +138,7 @@ import com.twine.tango.dal.TangoDB; * * return the Rml */ + @Bindable public Rml getRml() { return rml; @@ -141,6 +152,7 @@ import com.twine.tango.dal.TangoDB; public void setRml(Rml rml) { this.rml = rml; + notifyPropertyChanged(BR.rml); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Cct.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Cct.java index 398eba866..8d82c0fb6 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Cct.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Cct.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "CCTS", database = TangoDB.class) @@ -44,7 +46,7 @@ import com.twine.tango.dal.TangoDB; @Column(name = "VERSION") - private Double version; + private double version; @@ -59,6 +61,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -72,6 +75,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } @@ -80,6 +84,7 @@ import com.twine.tango.dal.TangoDB; * * return the Description */ + @Bindable public String getDescription() { return description; @@ -93,6 +98,7 @@ import com.twine.tango.dal.TangoDB; public void setDescription(String description) { this.description = description; + notifyPropertyChanged(BR.description); } @@ -101,6 +107,7 @@ import com.twine.tango.dal.TangoDB; * * return the ForwardFileName */ + @Bindable public String getForwardFileName() { return forwardFileName; @@ -114,6 +121,7 @@ import com.twine.tango.dal.TangoDB; public void setForwardFileName(String forwardFileName) { this.forwardFileName = forwardFileName; + notifyPropertyChanged(BR.forwardFileName); } @@ -122,6 +130,7 @@ import com.twine.tango.dal.TangoDB; * * return the InverseFileName */ + @Bindable public String getInverseFileName() { return inverseFileName; @@ -135,6 +144,7 @@ import com.twine.tango.dal.TangoDB; public void setInverseFileName(String inverseFileName) { this.inverseFileName = inverseFileName; + notifyPropertyChanged(BR.inverseFileName); } @@ -143,6 +153,7 @@ import com.twine.tango.dal.TangoDB; * * return the ForwardData */ + @Bindable public byte[] getForwardData() { return forwardData; @@ -156,6 +167,7 @@ import com.twine.tango.dal.TangoDB; public void setForwardData(byte[] forwardData) { this.forwardData = forwardData; + notifyPropertyChanged(BR.forwardData); } @@ -164,6 +176,7 @@ import com.twine.tango.dal.TangoDB; * * return the InverseData */ + @Bindable public byte[] getInverseData() { return inverseData; @@ -177,6 +190,7 @@ import com.twine.tango.dal.TangoDB; public void setInverseData(byte[] inverseData) { this.inverseData = inverseData; + notifyPropertyChanged(BR.inverseData); } @@ -185,7 +199,8 @@ import com.twine.tango.dal.TangoDB; * * return the Version */ - public Double getVersion() + @Bindable + public double getVersion() { return version; } @@ -195,9 +210,10 @@ import com.twine.tango.dal.TangoDB; * * @param version the Version */ - public void setVersion(Double version) + public void setVersion(double version) { this.version = version; + notifyPropertyChanged(BR.version); } @@ -206,6 +222,7 @@ import com.twine.tango.dal.TangoDB; * * return the Rml */ + @Bindable public Rml getRml() { return rml; @@ -219,6 +236,7 @@ import com.twine.tango.dal.TangoDB; public void setRml(Rml rml) { this.rml = rml; + notifyPropertyChanged(BR.rml); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorCatalog.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorCatalog.java index ea7bb425c..9466f5576 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorCatalog.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorCatalog.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "COLOR_CATALOGS", database = TangoDB.class) @@ -24,22 +26,22 @@ import com.twine.tango.dal.TangoDB; @Column(name = "CYAN") - private Double cyan; + private double cyan; @Column(name = "MAGENTA") - private Double magenta; + private double magenta; @Column(name = "YELLOW") - private Double yellow; + private double yellow; @Column(name = "BLACK") - private Double black; + private double black; @@ -59,57 +61,57 @@ import com.twine.tango.dal.TangoDB; @Column(name = "L") - private Double l; + private double l; @Column(name = "A") - private Double a; + private double a; @Column(name = "B") - private Double b; + private double b; @Column(name = "V0") - private Double v0; + private double v0; @Column(name = "V1") - private Double v1; + private double v1; @Column(name = "V2") - private Double v2; + private double v2; @Column(name = "V3") - private Double v3; + private double v3; @Column(name = "V4") - private Double v4; + private double v4; @Column(name = "V5") - private Double v5; + private double v5; @Column(name = "V6") - private Double v6; + private double v6; @Column(name = "V7") - private Double v7; + private double v7; @@ -124,6 +126,7 @@ import com.twine.tango.dal.TangoDB; * * return the ColorCode */ + @Bindable public int getColorCode() { return colorCode; @@ -137,6 +140,7 @@ import com.twine.tango.dal.TangoDB; public void setColorCode(int colorCode) { this.colorCode = colorCode; + notifyPropertyChanged(BR.colorCode); } @@ -145,6 +149,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -158,6 +163,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } @@ -166,7 +172,8 @@ import com.twine.tango.dal.TangoDB; * * return the Cyan */ - public Double getCyan() + @Bindable + public double getCyan() { return cyan; } @@ -176,9 +183,10 @@ import com.twine.tango.dal.TangoDB; * * @param cyan the Cyan */ - public void setCyan(Double cyan) + public void setCyan(double cyan) { this.cyan = cyan; + notifyPropertyChanged(BR.cyan); } @@ -187,7 +195,8 @@ import com.twine.tango.dal.TangoDB; * * return the Magenta */ - public Double getMagenta() + @Bindable + public double getMagenta() { return magenta; } @@ -197,9 +206,10 @@ import com.twine.tango.dal.TangoDB; * * @param magenta the Magenta */ - public void setMagenta(Double magenta) + public void setMagenta(double magenta) { this.magenta = magenta; + notifyPropertyChanged(BR.magenta); } @@ -208,7 +218,8 @@ import com.twine.tango.dal.TangoDB; * * return the Yellow */ - public Double getYellow() + @Bindable + public double getYellow() { return yellow; } @@ -218,9 +229,10 @@ import com.twine.tango.dal.TangoDB; * * @param yellow the Yellow */ - public void setYellow(Double yellow) + public void setYellow(double yellow) { this.yellow = yellow; + notifyPropertyChanged(BR.yellow); } @@ -229,7 +241,8 @@ import com.twine.tango.dal.TangoDB; * * return the Black */ - public Double getBlack() + @Bindable + public double getBlack() { return black; } @@ -239,9 +252,10 @@ import com.twine.tango.dal.TangoDB; * * @param black the Black */ - public void setBlack(Double black) + public void setBlack(double black) { this.black = black; + notifyPropertyChanged(BR.black); } @@ -250,6 +264,7 @@ import com.twine.tango.dal.TangoDB; * * return the Red */ + @Bindable public int getRed() { return red; @@ -263,6 +278,7 @@ import com.twine.tango.dal.TangoDB; public void setRed(int red) { this.red = red; + notifyPropertyChanged(BR.red); } @@ -271,6 +287,7 @@ import com.twine.tango.dal.TangoDB; * * return the Green */ + @Bindable public int getGreen() { return green; @@ -284,6 +301,7 @@ import com.twine.tango.dal.TangoDB; public void setGreen(int green) { this.green = green; + notifyPropertyChanged(BR.green); } @@ -292,6 +310,7 @@ import com.twine.tango.dal.TangoDB; * * return the Blue */ + @Bindable public int getBlue() { return blue; @@ -305,6 +324,7 @@ import com.twine.tango.dal.TangoDB; public void setBlue(int blue) { this.blue = blue; + notifyPropertyChanged(BR.blue); } @@ -313,7 +333,8 @@ import com.twine.tango.dal.TangoDB; * * return the L */ - public Double getL() + @Bindable + public double getL() { return l; } @@ -323,9 +344,10 @@ import com.twine.tango.dal.TangoDB; * * @param l the L */ - public void setL(Double l) + public void setL(double l) { this.l = l; + notifyPropertyChanged(BR.l); } @@ -334,7 +356,8 @@ import com.twine.tango.dal.TangoDB; * * return the A */ - public Double getA() + @Bindable + public double getA() { return a; } @@ -344,9 +367,10 @@ import com.twine.tango.dal.TangoDB; * * @param a the A */ - public void setA(Double a) + public void setA(double a) { this.a = a; + notifyPropertyChanged(BR.a); } @@ -355,7 +379,8 @@ import com.twine.tango.dal.TangoDB; * * return the B */ - public Double getB() + @Bindable + public double getB() { return b; } @@ -365,9 +390,10 @@ import com.twine.tango.dal.TangoDB; * * @param b the B */ - public void setB(Double b) + public void setB(double b) { this.b = b; + notifyPropertyChanged(BR.b); } @@ -376,7 +402,8 @@ import com.twine.tango.dal.TangoDB; * * return the V0 */ - public Double getV0() + @Bindable + public double getV0() { return v0; } @@ -386,9 +413,10 @@ import com.twine.tango.dal.TangoDB; * * @param v0 the V0 */ - public void setV0(Double v0) + public void setV0(double v0) { this.v0 = v0; + notifyPropertyChanged(BR.v0); } @@ -397,7 +425,8 @@ import com.twine.tango.dal.TangoDB; * * return the V1 */ - public Double getV1() + @Bindable + public double getV1() { return v1; } @@ -407,9 +436,10 @@ import com.twine.tango.dal.TangoDB; * * @param v1 the V1 */ - public void setV1(Double v1) + public void setV1(double v1) { this.v1 = v1; + notifyPropertyChanged(BR.v1); } @@ -418,7 +448,8 @@ import com.twine.tango.dal.TangoDB; * * return the V2 */ - public Double getV2() + @Bindable + public double getV2() { return v2; } @@ -428,9 +459,10 @@ import com.twine.tango.dal.TangoDB; * * @param v2 the V2 */ - public void setV2(Double v2) + public void setV2(double v2) { this.v2 = v2; + notifyPropertyChanged(BR.v2); } @@ -439,7 +471,8 @@ import com.twine.tango.dal.TangoDB; * * return the V3 */ - public Double getV3() + @Bindable + public double getV3() { return v3; } @@ -449,9 +482,10 @@ import com.twine.tango.dal.TangoDB; * * @param v3 the V3 */ - public void setV3(Double v3) + public void setV3(double v3) { this.v3 = v3; + notifyPropertyChanged(BR.v3); } @@ -460,7 +494,8 @@ import com.twine.tango.dal.TangoDB; * * return the V4 */ - public Double getV4() + @Bindable + public double getV4() { return v4; } @@ -470,9 +505,10 @@ import com.twine.tango.dal.TangoDB; * * @param v4 the V4 */ - public void setV4(Double v4) + public void setV4(double v4) { this.v4 = v4; + notifyPropertyChanged(BR.v4); } @@ -481,7 +517,8 @@ import com.twine.tango.dal.TangoDB; * * return the V5 */ - public Double getV5() + @Bindable + public double getV5() { return v5; } @@ -491,9 +528,10 @@ import com.twine.tango.dal.TangoDB; * * @param v5 the V5 */ - public void setV5(Double v5) + public void setV5(double v5) { this.v5 = v5; + notifyPropertyChanged(BR.v5); } @@ -502,7 +540,8 @@ import com.twine.tango.dal.TangoDB; * * return the V6 */ - public Double getV6() + @Bindable + public double getV6() { return v6; } @@ -512,9 +551,10 @@ import com.twine.tango.dal.TangoDB; * * @param v6 the V6 */ - public void setV6(Double v6) + public void setV6(double v6) { this.v6 = v6; + notifyPropertyChanged(BR.v6); } @@ -523,7 +563,8 @@ import com.twine.tango.dal.TangoDB; * * return the V7 */ - public Double getV7() + @Bindable + public double getV7() { return v7; } @@ -533,9 +574,10 @@ import com.twine.tango.dal.TangoDB; * * @param v7 the V7 */ - public void setV7(Double v7) + public void setV7(double v7) { this.v7 = v7; + notifyPropertyChanged(BR.v7); } @@ -544,6 +586,7 @@ import com.twine.tango.dal.TangoDB; * * return the ColorSpaces */ + @Bindable public ColorSpace getColorSpaces() { return colorSpaces; @@ -557,6 +600,7 @@ import com.twine.tango.dal.TangoDB; public void setColorSpaces(ColorSpace colorSpaces) { this.colorSpaces = colorSpaces; + notifyPropertyChanged(BR.colorSpaces); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorSpace.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorSpace.java index 661fa477b..e97b97089 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorSpace.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorSpace.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "COLOR_SPACES", database = TangoDB.class) @@ -34,6 +36,7 @@ import com.twine.tango.dal.TangoDB; * * return the Code */ + @Bindable public int getCode() { return code; @@ -47,6 +50,7 @@ import com.twine.tango.dal.TangoDB; public void setCode(int code) { this.code = code; + notifyPropertyChanged(BR.code); } @@ -55,6 +59,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -68,6 +73,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } @@ -76,6 +82,7 @@ import com.twine.tango.dal.TangoDB; * * return the Description */ + @Bindable public String getDescription() { return description; @@ -89,6 +96,7 @@ import com.twine.tango.dal.TangoDB; public void setDescription(String description) { this.description = description; + notifyPropertyChanged(BR.description); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Configuration.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Configuration.java index 6eaa78902..0dd96c07b 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Configuration.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Configuration.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "CONFIGURATIONS", database = TangoDB.class) @@ -64,6 +66,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -77,6 +80,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } @@ -85,6 +89,7 @@ import com.twine.tango.dal.TangoDB; * * return the CreationDate */ + @Bindable public DateTime getCreationDate() { return creationDate; @@ -98,6 +103,7 @@ import com.twine.tango.dal.TangoDB; public void setCreationDate(DateTime creationDate) { this.creationDate = creationDate; + notifyPropertyChanged(BR.creationDate); } @@ -106,6 +112,7 @@ import com.twine.tango.dal.TangoDB; * * return the ApplicationDisplayPanelVersions */ + @Bindable public ApplicationDisplayPanelVersion getApplicationDisplayPanelVersions() { return applicationDisplayPanelVersions; @@ -119,6 +126,7 @@ import com.twine.tango.dal.TangoDB; public void setApplicationDisplayPanelVersions(ApplicationDisplayPanelVersion applicationDisplayPanelVersions) { this.applicationDisplayPanelVersions = applicationDisplayPanelVersions; + notifyPropertyChanged(BR.applicationDisplayPanelVersions); } @@ -127,6 +135,7 @@ import com.twine.tango.dal.TangoDB; * * return the ApplicationFirmwareVersions */ + @Bindable public ApplicationFirmwareVersion getApplicationFirmwareVersions() { return applicationFirmwareVersions; @@ -140,6 +149,7 @@ import com.twine.tango.dal.TangoDB; public void setApplicationFirmwareVersions(ApplicationFirmwareVersion applicationFirmwareVersions) { this.applicationFirmwareVersions = applicationFirmwareVersions; + notifyPropertyChanged(BR.applicationFirmwareVersions); } @@ -148,6 +158,7 @@ import com.twine.tango.dal.TangoDB; * * return the ApplicationOsVersions */ + @Bindable public ApplicationOsVersion getApplicationOsVersions() { return applicationOsVersions; @@ -161,6 +172,7 @@ import com.twine.tango.dal.TangoDB; public void setApplicationOsVersions(ApplicationOsVersion applicationOsVersions) { this.applicationOsVersions = applicationOsVersions; + notifyPropertyChanged(BR.applicationOsVersions); } @@ -169,6 +181,7 @@ import com.twine.tango.dal.TangoDB; * * return the ApplicationVersions */ + @Bindable public ApplicationVersion getApplicationVersions() { return applicationVersions; @@ -182,6 +195,7 @@ import com.twine.tango.dal.TangoDB; public void setApplicationVersions(ApplicationVersion applicationVersions) { this.applicationVersions = applicationVersions; + notifyPropertyChanged(BR.applicationVersions); } @@ -190,6 +204,7 @@ import com.twine.tango.dal.TangoDB; * * return the EmbeddedFirmwareVersions */ + @Bindable public EmbeddedFirmwareVersion getEmbeddedFirmwareVersions() { return embeddedFirmwareVersions; @@ -203,6 +218,7 @@ import com.twine.tango.dal.TangoDB; public void setEmbeddedFirmwareVersions(EmbeddedFirmwareVersion embeddedFirmwareVersions) { this.embeddedFirmwareVersions = embeddedFirmwareVersions; + notifyPropertyChanged(BR.embeddedFirmwareVersions); } @@ -211,6 +227,7 @@ import com.twine.tango.dal.TangoDB; * * return the EmbeddedSoftwareVersions */ + @Bindable public EmbeddedSoftwareVersion getEmbeddedSoftwareVersions() { return embeddedSoftwareVersions; @@ -224,6 +241,7 @@ import com.twine.tango.dal.TangoDB; public void setEmbeddedSoftwareVersions(EmbeddedSoftwareVersion embeddedSoftwareVersions) { this.embeddedSoftwareVersions = embeddedSoftwareVersions; + notifyPropertyChanged(BR.embeddedSoftwareVersions); } @@ -232,6 +250,7 @@ import com.twine.tango.dal.TangoDB; * * return the HardwareVersions */ + @Bindable public HardwareVersion getHardwareVersions() { return hardwareVersions; @@ -245,6 +264,7 @@ import com.twine.tango.dal.TangoDB; public void setHardwareVersions(HardwareVersion hardwareVersions) { this.hardwareVersions = hardwareVersions; + notifyPropertyChanged(BR.hardwareVersions); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Contact.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Contact.java index 9f84e1038..8480ef8ac 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Contact.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Contact.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "CONTACTS", database = TangoDB.class) @@ -14,7 +16,7 @@ import com.twine.tango.dal.TangoDB; { @Column(name = "DELETED") - private Boolean deleted; + private boolean deleted; @@ -54,7 +56,8 @@ import com.twine.tango.dal.TangoDB; * * return the Deleted */ - public Boolean isDeleted() + @Bindable + public boolean isDeleted() { return deleted; } @@ -64,9 +67,10 @@ import com.twine.tango.dal.TangoDB; * * @param deleted the Deleted */ - public void setDeleted(Boolean deleted) + public void setDeleted(boolean deleted) { this.deleted = deleted; + notifyPropertyChanged(BR.deleted); } @@ -75,6 +79,7 @@ import com.twine.tango.dal.TangoDB; * * return the FirstName */ + @Bindable public String getFirstName() { return firstName; @@ -88,6 +93,7 @@ import com.twine.tango.dal.TangoDB; public void setFirstName(String firstName) { this.firstName = firstName; + notifyPropertyChanged(BR.firstName); } @@ -96,6 +102,7 @@ import com.twine.tango.dal.TangoDB; * * return the LastName */ + @Bindable public String getLastName() { return lastName; @@ -109,6 +116,7 @@ import com.twine.tango.dal.TangoDB; public void setLastName(String lastName) { this.lastName = lastName; + notifyPropertyChanged(BR.lastName); } @@ -117,6 +125,7 @@ import com.twine.tango.dal.TangoDB; * * return the FullName */ + @Bindable public String getFullName() { return fullName; @@ -130,6 +139,7 @@ import com.twine.tango.dal.TangoDB; public void setFullName(String fullName) { this.fullName = fullName; + notifyPropertyChanged(BR.fullName); } @@ -138,6 +148,7 @@ import com.twine.tango.dal.TangoDB; * * return the Email */ + @Bindable public String getEmail() { return email; @@ -151,6 +162,7 @@ import com.twine.tango.dal.TangoDB; public void setEmail(String email) { this.email = email; + notifyPropertyChanged(BR.email); } @@ -159,6 +171,7 @@ import com.twine.tango.dal.TangoDB; * * return the PhoneNumber */ + @Bindable public String getPhoneNumber() { return phoneNumber; @@ -172,6 +185,7 @@ import com.twine.tango.dal.TangoDB; public void setPhoneNumber(String phoneNumber) { this.phoneNumber = phoneNumber; + notifyPropertyChanged(BR.phoneNumber); } @@ -180,6 +194,7 @@ import com.twine.tango.dal.TangoDB; * * return the Fax */ + @Bindable public String getFax() { return fax; @@ -193,6 +208,7 @@ import com.twine.tango.dal.TangoDB; public void setFax(String fax) { this.fax = fax; + notifyPropertyChanged(BR.fax); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/DispenserType.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/DispenserType.java index ab36f1020..2aacd834f 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/DispenserType.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/DispenserType.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "DISPENSER_TYPES", database = TangoDB.class) @@ -24,12 +26,12 @@ import com.twine.tango.dal.TangoDB; @Column(name = "NL_PER_PULSE") - private Double nlPerPulse; + private double nlPerPulse; @Column(name = "CAPACITY") - private Double capacity; + private double capacity; @@ -54,37 +56,37 @@ import com.twine.tango.dal.TangoDB; @Column(name = "CORRECTION_GAIN") - private Double correctionGain; + private double correctionGain; @Column(name = "RATIO_TO_DRYER_SPEED") - private Double ratioToDryerSpeed; + private double ratioToDryerSpeed; @Column(name = "KP") - private Double kp; + private double kp; @Column(name = "KI") - private Double ki; + private double ki; @Column(name = "KD") - private Double kd; + private double kd; @Column(name = "CHANGE_SLOPE") - private Double changeSlope; + private double changeSlope; @Column(name = "HIGH_LENGTH_MICRO_SECOND") - private Double highLengthMicroSecond; + private double highLengthMicroSecond; @@ -99,6 +101,7 @@ import com.twine.tango.dal.TangoDB; * * return the Code */ + @Bindable public int getCode() { return code; @@ -112,6 +115,7 @@ import com.twine.tango.dal.TangoDB; public void setCode(int code) { this.code = code; + notifyPropertyChanged(BR.code); } @@ -120,6 +124,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -133,6 +138,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } @@ -141,7 +147,8 @@ import com.twine.tango.dal.TangoDB; * * return the NlPerPulse */ - public Double getNlPerPulse() + @Bindable + public double getNlPerPulse() { return nlPerPulse; } @@ -151,9 +158,10 @@ import com.twine.tango.dal.TangoDB; * * @param nlPerPulse the NlPerPulse */ - public void setNlPerPulse(Double nlPerPulse) + public void setNlPerPulse(double nlPerPulse) { this.nlPerPulse = nlPerPulse; + notifyPropertyChanged(BR.nlPerPulse); } @@ -162,7 +170,8 @@ import com.twine.tango.dal.TangoDB; * * return the Capacity */ - public Double getCapacity() + @Bindable + public double getCapacity() { return capacity; } @@ -172,9 +181,10 @@ import com.twine.tango.dal.TangoDB; * * @param capacity the Capacity */ - public void setCapacity(Double capacity) + public void setCapacity(double capacity) { this.capacity = capacity; + notifyPropertyChanged(BR.capacity); } @@ -183,6 +193,7 @@ import com.twine.tango.dal.TangoDB; * * return the MinFrequency */ + @Bindable public int getMinFrequency() { return minFrequency; @@ -196,6 +207,7 @@ import com.twine.tango.dal.TangoDB; public void setMinFrequency(int minFrequency) { this.minFrequency = minFrequency; + notifyPropertyChanged(BR.minFrequency); } @@ -204,6 +216,7 @@ import com.twine.tango.dal.TangoDB; * * return the MaxFrequency */ + @Bindable public int getMaxFrequency() { return maxFrequency; @@ -217,6 +230,7 @@ import com.twine.tango.dal.TangoDB; public void setMaxFrequency(int maxFrequency) { this.maxFrequency = maxFrequency; + notifyPropertyChanged(BR.maxFrequency); } @@ -225,6 +239,7 @@ import com.twine.tango.dal.TangoDB; * * return the MinMicroStep */ + @Bindable public int getMinMicroStep() { return minMicroStep; @@ -238,6 +253,7 @@ import com.twine.tango.dal.TangoDB; public void setMinMicroStep(int minMicroStep) { this.minMicroStep = minMicroStep; + notifyPropertyChanged(BR.minMicroStep); } @@ -246,6 +262,7 @@ import com.twine.tango.dal.TangoDB; * * return the MaxMicroStep */ + @Bindable public int getMaxMicroStep() { return maxMicroStep; @@ -259,6 +276,7 @@ import com.twine.tango.dal.TangoDB; public void setMaxMicroStep(int maxMicroStep) { this.maxMicroStep = maxMicroStep; + notifyPropertyChanged(BR.maxMicroStep); } @@ -267,7 +285,8 @@ import com.twine.tango.dal.TangoDB; * * return the CorrectionGain */ - public Double getCorrectionGain() + @Bindable + public double getCorrectionGain() { return correctionGain; } @@ -277,9 +296,10 @@ import com.twine.tango.dal.TangoDB; * * @param correctionGain the CorrectionGain */ - public void setCorrectionGain(Double correctionGain) + public void setCorrectionGain(double correctionGain) { this.correctionGain = correctionGain; + notifyPropertyChanged(BR.correctionGain); } @@ -288,7 +308,8 @@ import com.twine.tango.dal.TangoDB; * * return the RatioToDryerSpeed */ - public Double getRatioToDryerSpeed() + @Bindable + public double getRatioToDryerSpeed() { return ratioToDryerSpeed; } @@ -298,9 +319,10 @@ import com.twine.tango.dal.TangoDB; * * @param ratioToDryerSpeed the RatioToDryerSpeed */ - public void setRatioToDryerSpeed(Double ratioToDryerSpeed) + public void setRatioToDryerSpeed(double ratioToDryerSpeed) { this.ratioToDryerSpeed = ratioToDryerSpeed; + notifyPropertyChanged(BR.ratioToDryerSpeed); } @@ -309,7 +331,8 @@ import com.twine.tango.dal.TangoDB; * * return the Kp */ - public Double getKp() + @Bindable + public double getKp() { return kp; } @@ -319,9 +342,10 @@ import com.twine.tango.dal.TangoDB; * * @param kp the Kp */ - public void setKp(Double kp) + public void setKp(double kp) { this.kp = kp; + notifyPropertyChanged(BR.kp); } @@ -330,7 +354,8 @@ import com.twine.tango.dal.TangoDB; * * return the Ki */ - public Double getKi() + @Bindable + public double getKi() { return ki; } @@ -340,9 +365,10 @@ import com.twine.tango.dal.TangoDB; * * @param ki the Ki */ - public void setKi(Double ki) + public void setKi(double ki) { this.ki = ki; + notifyPropertyChanged(BR.ki); } @@ -351,7 +377,8 @@ import com.twine.tango.dal.TangoDB; * * return the Kd */ - public Double getKd() + @Bindable + public double getKd() { return kd; } @@ -361,9 +388,10 @@ import com.twine.tango.dal.TangoDB; * * @param kd the Kd */ - public void setKd(Double kd) + public void setKd(double kd) { this.kd = kd; + notifyPropertyChanged(BR.kd); } @@ -372,7 +400,8 @@ import com.twine.tango.dal.TangoDB; * * return the ChangeSlope */ - public Double getChangeSlope() + @Bindable + public double getChangeSlope() { return changeSlope; } @@ -382,9 +411,10 @@ import com.twine.tango.dal.TangoDB; * * @param changeSlope the ChangeSlope */ - public void setChangeSlope(Double changeSlope) + public void setChangeSlope(double changeSlope) { this.changeSlope = changeSlope; + notifyPropertyChanged(BR.changeSlope); } @@ -393,7 +423,8 @@ import com.twine.tango.dal.TangoDB; * * return the HighLengthMicroSecond */ - public Double getHighLengthMicroSecond() + @Bindable + public double getHighLengthMicroSecond() { return highLengthMicroSecond; } @@ -403,9 +434,10 @@ import com.twine.tango.dal.TangoDB; * * @param highLengthMicroSecond the HighLengthMicroSecond */ - public void setHighLengthMicroSecond(Double highLengthMicroSecond) + public void setHighLengthMicroSecond(double highLengthMicroSecond) { this.highLengthMicroSecond = highLengthMicroSecond; + notifyPropertyChanged(BR.highLengthMicroSecond); } @@ -414,6 +446,7 @@ import com.twine.tango.dal.TangoDB; * * return the ControlTiming */ + @Bindable public int getControlTiming() { return controlTiming; @@ -427,6 +460,7 @@ import com.twine.tango.dal.TangoDB; public void setControlTiming(int controlTiming) { this.controlTiming = controlTiming; + notifyPropertyChanged(BR.controlTiming); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedFirmwareVersion.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedFirmwareVersion.java index 9e8a1fe78..8c5847f98 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedFirmwareVersion.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedFirmwareVersion.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "EMBEDDED_FIRMWARE_VERSIONS", database = TangoDB.class) @@ -14,7 +16,7 @@ import com.twine.tango.dal.TangoDB; { @Column(name = "VERSION") - private Double version; + private double version; @@ -29,7 +31,8 @@ import com.twine.tango.dal.TangoDB; * * return the Version */ - public Double getVersion() + @Bindable + public double getVersion() { return version; } @@ -39,9 +42,10 @@ import com.twine.tango.dal.TangoDB; * * @param version the Version */ - public void setVersion(Double version) + public void setVersion(double version) { this.version = version; + notifyPropertyChanged(BR.version); } @@ -50,6 +54,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -63,6 +68,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedSoftwareVersion.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedSoftwareVersion.java index 1c4d67a2c..5275e2d9f 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedSoftwareVersion.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedSoftwareVersion.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "EMBEDDED_SOFTWARE_VERSIONS", database = TangoDB.class) @@ -14,7 +16,7 @@ import com.twine.tango.dal.TangoDB; { @Column(name = "VERSION") - private Double version; + private double version; @@ -29,7 +31,8 @@ import com.twine.tango.dal.TangoDB; * * return the Version */ - public Double getVersion() + @Bindable + public double getVersion() { return version; } @@ -39,9 +42,10 @@ import com.twine.tango.dal.TangoDB; * * @param version the Version */ - public void setVersion(Double version) + public void setVersion(double version) { this.version = version; + notifyPropertyChanged(BR.version); } @@ -50,6 +54,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -63,6 +68,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventType.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventType.java index a5d547538..b216de6ab 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventType.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventType.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "EVENT_TYPES", database = TangoDB.class) @@ -44,6 +46,7 @@ import com.twine.tango.dal.TangoDB; * * return the Code */ + @Bindable public int getCode() { return code; @@ -57,6 +60,7 @@ import com.twine.tango.dal.TangoDB; public void setCode(int code) { this.code = code; + notifyPropertyChanged(BR.code); } @@ -65,6 +69,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -78,6 +83,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } @@ -86,6 +92,7 @@ import com.twine.tango.dal.TangoDB; * * return the Description */ + @Bindable public String getDescription() { return description; @@ -99,6 +106,7 @@ import com.twine.tango.dal.TangoDB; public void setDescription(String description) { this.description = description; + notifyPropertyChanged(BR.description); } @@ -107,6 +115,7 @@ import com.twine.tango.dal.TangoDB; * * return the EventTypesGroups */ + @Bindable public EventTypesGroup getEventTypesGroups() { return eventTypesGroups; @@ -120,6 +129,7 @@ import com.twine.tango.dal.TangoDB; public void setEventTypesGroups(EventTypesGroup eventTypesGroups) { this.eventTypesGroups = eventTypesGroups; + notifyPropertyChanged(BR.eventTypesGroups); } @@ -128,6 +138,7 @@ import com.twine.tango.dal.TangoDB; * * return the EventTypesCategories */ + @Bindable public EventTypesCategory getEventTypesCategories() { return eventTypesCategories; @@ -141,6 +152,7 @@ import com.twine.tango.dal.TangoDB; public void setEventTypesCategories(EventTypesCategory eventTypesCategories) { this.eventTypesCategories = eventTypesCategories; + notifyPropertyChanged(BR.eventTypesCategories); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesAction.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesAction.java index 7189d6066..3426689b6 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesAction.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesAction.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "EVENT_TYPES_ACTIONS", database = TangoDB.class) @@ -29,6 +31,7 @@ import com.twine.tango.dal.TangoDB; * * return the ActionTypes */ + @Bindable public ActionType getActionTypes() { return actionTypes; @@ -42,6 +45,7 @@ import com.twine.tango.dal.TangoDB; public void setActionTypes(ActionType actionTypes) { this.actionTypes = actionTypes; + notifyPropertyChanged(BR.actionTypes); } @@ -50,6 +54,7 @@ import com.twine.tango.dal.TangoDB; * * return the EventTypes */ + @Bindable public EventType getEventTypes() { return eventTypes; @@ -63,6 +68,7 @@ import com.twine.tango.dal.TangoDB; public void setEventTypes(EventType eventTypes) { this.eventTypes = eventTypes; + notifyPropertyChanged(BR.eventTypes); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesCategory.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesCategory.java index 754dd06ae..622550cc8 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesCategory.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesCategory.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "EVENT_TYPES_CATEGORIES", database = TangoDB.class) @@ -34,6 +36,7 @@ import com.twine.tango.dal.TangoDB; * * return the Code */ + @Bindable public int getCode() { return code; @@ -47,6 +50,7 @@ import com.twine.tango.dal.TangoDB; public void setCode(int code) { this.code = code; + notifyPropertyChanged(BR.code); } @@ -55,6 +59,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -68,6 +73,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } @@ -76,6 +82,7 @@ import com.twine.tango.dal.TangoDB; * * return the Description */ + @Bindable public String getDescription() { return description; @@ -89,6 +96,7 @@ import com.twine.tango.dal.TangoDB; public void setDescription(String description) { this.description = description; + notifyPropertyChanged(BR.description); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesGroup.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesGroup.java index 113ffe55a..702abce1e 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesGroup.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesGroup.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "EVENT_TYPES_GROUPS", database = TangoDB.class) @@ -34,6 +36,7 @@ import com.twine.tango.dal.TangoDB; * * return the Code */ + @Bindable public int getCode() { return code; @@ -47,6 +50,7 @@ import com.twine.tango.dal.TangoDB; public void setCode(int code) { this.code = code; + notifyPropertyChanged(BR.code); } @@ -55,6 +59,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -68,6 +73,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } @@ -76,6 +82,7 @@ import com.twine.tango.dal.TangoDB; * * return the Description */ + @Bindable public String getDescription() { return description; @@ -89,6 +96,7 @@ import com.twine.tango.dal.TangoDB; public void setDescription(String description) { this.description = description; + notifyPropertyChanged(BR.description); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberShape.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberShape.java index 3005518f6..751912fa7 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberShape.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberShape.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "FIBER_SHAPES", database = TangoDB.class) @@ -29,6 +31,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -42,6 +45,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } @@ -50,6 +54,7 @@ import com.twine.tango.dal.TangoDB; * * return the Code */ + @Bindable public int getCode() { return code; @@ -63,6 +68,7 @@ import com.twine.tango.dal.TangoDB; public void setCode(int code) { this.code = code; + notifyPropertyChanged(BR.code); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberSynth.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberSynth.java index b1fe190c2..c13852c1a 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberSynth.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberSynth.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "FIBER_SYNTHS", database = TangoDB.class) @@ -29,6 +31,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -42,6 +45,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } @@ -50,6 +54,7 @@ import com.twine.tango.dal.TangoDB; * * return the Code */ + @Bindable public int getCode() { return code; @@ -63,6 +68,7 @@ import com.twine.tango.dal.TangoDB; public void setCode(int code) { this.code = code; + notifyPropertyChanged(BR.code); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancer.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancer.java index 8f8e79caf..25e888fbd 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancer.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancer.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "HARDWARE_DANCERS", database = TangoDB.class) @@ -14,17 +16,17 @@ import com.twine.tango.dal.TangoDB; { @Column(name = "GRADUAL") - private Boolean gradual; + private boolean gradual; @Column(name = "K") - private Double k; + private double k; @Column(name = "X") - private Double x; + private double x; @@ -49,7 +51,8 @@ import com.twine.tango.dal.TangoDB; * * return the Gradual */ - public Boolean isGradual() + @Bindable + public boolean isGradual() { return gradual; } @@ -59,9 +62,10 @@ import com.twine.tango.dal.TangoDB; * * @param gradual the Gradual */ - public void setGradual(Boolean gradual) + public void setGradual(boolean gradual) { this.gradual = gradual; + notifyPropertyChanged(BR.gradual); } @@ -70,7 +74,8 @@ import com.twine.tango.dal.TangoDB; * * return the K */ - public Double getK() + @Bindable + public double getK() { return k; } @@ -80,9 +85,10 @@ import com.twine.tango.dal.TangoDB; * * @param k the K */ - public void setK(Double k) + public void setK(double k) { this.k = k; + notifyPropertyChanged(BR.k); } @@ -91,7 +97,8 @@ import com.twine.tango.dal.TangoDB; * * return the X */ - public Double getX() + @Bindable + public double getX() { return x; } @@ -101,9 +108,10 @@ import com.twine.tango.dal.TangoDB; * * @param x the X */ - public void setX(Double x) + public void setX(double x) { this.x = x; + notifyPropertyChanged(BR.x); } @@ -112,6 +120,7 @@ import com.twine.tango.dal.TangoDB; * * return the PulsePerMmSpring */ + @Bindable public int getPulsePerMmSpring() { return pulsePerMmSpring; @@ -125,6 +134,7 @@ import com.twine.tango.dal.TangoDB; public void setPulsePerMmSpring(int pulsePerMmSpring) { this.pulsePerMmSpring = pulsePerMmSpring; + notifyPropertyChanged(BR.pulsePerMmSpring); } @@ -133,6 +143,7 @@ import com.twine.tango.dal.TangoDB; * * return the HardwareDancerTypes */ + @Bindable public HardwareDancerType getHardwareDancerTypes() { return hardwareDancerTypes; @@ -146,6 +157,7 @@ import com.twine.tango.dal.TangoDB; public void setHardwareDancerTypes(HardwareDancerType hardwareDancerTypes) { this.hardwareDancerTypes = hardwareDancerTypes; + notifyPropertyChanged(BR.hardwareDancerTypes); } @@ -154,6 +166,7 @@ import com.twine.tango.dal.TangoDB; * * return the HardwareVersions */ + @Bindable public HardwareVersion getHardwareVersions() { return hardwareVersions; @@ -167,6 +180,7 @@ import com.twine.tango.dal.TangoDB; public void setHardwareVersions(HardwareVersion hardwareVersions) { this.hardwareVersions = hardwareVersions; + notifyPropertyChanged(BR.hardwareVersions); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancerType.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancerType.java index d4206ac9e..4654fae40 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancerType.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancerType.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "HARDWARE_DANCER_TYPES", database = TangoDB.class) @@ -34,6 +36,7 @@ import com.twine.tango.dal.TangoDB; * * return the Code */ + @Bindable public int getCode() { return code; @@ -47,6 +50,7 @@ import com.twine.tango.dal.TangoDB; public void setCode(int code) { this.code = code; + notifyPropertyChanged(BR.code); } @@ -55,6 +59,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -68,6 +73,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } @@ -76,6 +82,7 @@ import com.twine.tango.dal.TangoDB; * * return the Description */ + @Bindable public String getDescription() { return description; @@ -89,6 +96,7 @@ import com.twine.tango.dal.TangoDB; public void setDescription(String description) { this.description = description; + notifyPropertyChanged(BR.description); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotor.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotor.java index 6b1b8071d..72b576034 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotor.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotor.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "HARDWARE_MOTORS", database = TangoDB.class) @@ -34,7 +36,7 @@ import com.twine.tango.dal.TangoDB; @Column(name = "LINEAR_RATIO") - private Double linearRatio; + private double linearRatio; @@ -44,42 +46,42 @@ import com.twine.tango.dal.TangoDB; @Column(name = "CORRECTION_GAIN") - private Double correctionGain; + private double correctionGain; @Column(name = "RATIO_TO_DRYER_SPEED") - private Double ratioToDryerSpeed; + private double ratioToDryerSpeed; @Column(name = "KP") - private Double kp; + private double kp; @Column(name = "KI") - private Double ki; + private double ki; @Column(name = "KD") - private Double kd; + private double kd; @Column(name = "CHANGE_SLOPE") - private Double changeSlope; + private double changeSlope; @Column(name = "HIGH_LENGTH_MICRO_SECOND") - private Double highLengthMicroSecond; + private double highLengthMicroSecond; @Column(name = "SPEED_MASTER") - private Boolean speedMaster; + private boolean speedMaster; @@ -99,6 +101,7 @@ import com.twine.tango.dal.TangoDB; * * return the MinFrequency */ + @Bindable public int getMinFrequency() { return minFrequency; @@ -112,6 +115,7 @@ import com.twine.tango.dal.TangoDB; public void setMinFrequency(int minFrequency) { this.minFrequency = minFrequency; + notifyPropertyChanged(BR.minFrequency); } @@ -120,6 +124,7 @@ import com.twine.tango.dal.TangoDB; * * return the MaxFrequency */ + @Bindable public int getMaxFrequency() { return maxFrequency; @@ -133,6 +138,7 @@ import com.twine.tango.dal.TangoDB; public void setMaxFrequency(int maxFrequency) { this.maxFrequency = maxFrequency; + notifyPropertyChanged(BR.maxFrequency); } @@ -141,6 +147,7 @@ import com.twine.tango.dal.TangoDB; * * return the MinMicroStep */ + @Bindable public int getMinMicroStep() { return minMicroStep; @@ -154,6 +161,7 @@ import com.twine.tango.dal.TangoDB; public void setMinMicroStep(int minMicroStep) { this.minMicroStep = minMicroStep; + notifyPropertyChanged(BR.minMicroStep); } @@ -162,6 +170,7 @@ import com.twine.tango.dal.TangoDB; * * return the MaxMicroStep */ + @Bindable public int getMaxMicroStep() { return maxMicroStep; @@ -175,6 +184,7 @@ import com.twine.tango.dal.TangoDB; public void setMaxMicroStep(int maxMicroStep) { this.maxMicroStep = maxMicroStep; + notifyPropertyChanged(BR.maxMicroStep); } @@ -183,7 +193,8 @@ import com.twine.tango.dal.TangoDB; * * return the LinearRatio */ - public Double getLinearRatio() + @Bindable + public double getLinearRatio() { return linearRatio; } @@ -193,9 +204,10 @@ import com.twine.tango.dal.TangoDB; * * @param linearRatio the LinearRatio */ - public void setLinearRatio(Double linearRatio) + public void setLinearRatio(double linearRatio) { this.linearRatio = linearRatio; + notifyPropertyChanged(BR.linearRatio); } @@ -204,6 +216,7 @@ import com.twine.tango.dal.TangoDB; * * return the MedianPosition */ + @Bindable public int getMedianPosition() { return medianPosition; @@ -217,6 +230,7 @@ import com.twine.tango.dal.TangoDB; public void setMedianPosition(int medianPosition) { this.medianPosition = medianPosition; + notifyPropertyChanged(BR.medianPosition); } @@ -225,7 +239,8 @@ import com.twine.tango.dal.TangoDB; * * return the CorrectionGain */ - public Double getCorrectionGain() + @Bindable + public double getCorrectionGain() { return correctionGain; } @@ -235,9 +250,10 @@ import com.twine.tango.dal.TangoDB; * * @param correctionGain the CorrectionGain */ - public void setCorrectionGain(Double correctionGain) + public void setCorrectionGain(double correctionGain) { this.correctionGain = correctionGain; + notifyPropertyChanged(BR.correctionGain); } @@ -246,7 +262,8 @@ import com.twine.tango.dal.TangoDB; * * return the RatioToDryerSpeed */ - public Double getRatioToDryerSpeed() + @Bindable + public double getRatioToDryerSpeed() { return ratioToDryerSpeed; } @@ -256,9 +273,10 @@ import com.twine.tango.dal.TangoDB; * * @param ratioToDryerSpeed the RatioToDryerSpeed */ - public void setRatioToDryerSpeed(Double ratioToDryerSpeed) + public void setRatioToDryerSpeed(double ratioToDryerSpeed) { this.ratioToDryerSpeed = ratioToDryerSpeed; + notifyPropertyChanged(BR.ratioToDryerSpeed); } @@ -267,7 +285,8 @@ import com.twine.tango.dal.TangoDB; * * return the Kp */ - public Double getKp() + @Bindable + public double getKp() { return kp; } @@ -277,9 +296,10 @@ import com.twine.tango.dal.TangoDB; * * @param kp the Kp */ - public void setKp(Double kp) + public void setKp(double kp) { this.kp = kp; + notifyPropertyChanged(BR.kp); } @@ -288,7 +308,8 @@ import com.twine.tango.dal.TangoDB; * * return the Ki */ - public Double getKi() + @Bindable + public double getKi() { return ki; } @@ -298,9 +319,10 @@ import com.twine.tango.dal.TangoDB; * * @param ki the Ki */ - public void setKi(Double ki) + public void setKi(double ki) { this.ki = ki; + notifyPropertyChanged(BR.ki); } @@ -309,7 +331,8 @@ import com.twine.tango.dal.TangoDB; * * return the Kd */ - public Double getKd() + @Bindable + public double getKd() { return kd; } @@ -319,9 +342,10 @@ import com.twine.tango.dal.TangoDB; * * @param kd the Kd */ - public void setKd(Double kd) + public void setKd(double kd) { this.kd = kd; + notifyPropertyChanged(BR.kd); } @@ -330,7 +354,8 @@ import com.twine.tango.dal.TangoDB; * * return the ChangeSlope */ - public Double getChangeSlope() + @Bindable + public double getChangeSlope() { return changeSlope; } @@ -340,9 +365,10 @@ import com.twine.tango.dal.TangoDB; * * @param changeSlope the ChangeSlope */ - public void setChangeSlope(Double changeSlope) + public void setChangeSlope(double changeSlope) { this.changeSlope = changeSlope; + notifyPropertyChanged(BR.changeSlope); } @@ -351,7 +377,8 @@ import com.twine.tango.dal.TangoDB; * * return the HighLengthMicroSecond */ - public Double getHighLengthMicroSecond() + @Bindable + public double getHighLengthMicroSecond() { return highLengthMicroSecond; } @@ -361,9 +388,10 @@ import com.twine.tango.dal.TangoDB; * * @param highLengthMicroSecond the HighLengthMicroSecond */ - public void setHighLengthMicroSecond(Double highLengthMicroSecond) + public void setHighLengthMicroSecond(double highLengthMicroSecond) { this.highLengthMicroSecond = highLengthMicroSecond; + notifyPropertyChanged(BR.highLengthMicroSecond); } @@ -372,7 +400,8 @@ import com.twine.tango.dal.TangoDB; * * return the SpeedMaster */ - public Boolean isSpeedMaster() + @Bindable + public boolean isSpeedMaster() { return speedMaster; } @@ -382,9 +411,10 @@ import com.twine.tango.dal.TangoDB; * * @param speedMaster the SpeedMaster */ - public void setSpeedMaster(Boolean speedMaster) + public void setSpeedMaster(boolean speedMaster) { this.speedMaster = speedMaster; + notifyPropertyChanged(BR.speedMaster); } @@ -393,6 +423,7 @@ import com.twine.tango.dal.TangoDB; * * return the HardwareMotorTypes */ + @Bindable public HardwareMotorType getHardwareMotorTypes() { return hardwareMotorTypes; @@ -406,6 +437,7 @@ import com.twine.tango.dal.TangoDB; public void setHardwareMotorTypes(HardwareMotorType hardwareMotorTypes) { this.hardwareMotorTypes = hardwareMotorTypes; + notifyPropertyChanged(BR.hardwareMotorTypes); } @@ -414,6 +446,7 @@ import com.twine.tango.dal.TangoDB; * * return the HardwareVersions */ + @Bindable public HardwareVersion getHardwareVersions() { return hardwareVersions; @@ -427,6 +460,7 @@ import com.twine.tango.dal.TangoDB; public void setHardwareVersions(HardwareVersion hardwareVersions) { this.hardwareVersions = hardwareVersions; + notifyPropertyChanged(BR.hardwareVersions); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotorType.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotorType.java index 849e43315..80674e6fa 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotorType.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotorType.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "HARDWARE_MOTOR_TYPES", database = TangoDB.class) @@ -34,6 +36,7 @@ import com.twine.tango.dal.TangoDB; * * return the Code */ + @Bindable public int getCode() { return code; @@ -47,6 +50,7 @@ import com.twine.tango.dal.TangoDB; public void setCode(int code) { this.code = code; + notifyPropertyChanged(BR.code); } @@ -55,6 +59,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -68,6 +73,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } @@ -76,6 +82,7 @@ import com.twine.tango.dal.TangoDB; * * return the Description */ + @Bindable public String getDescription() { return description; @@ -89,6 +96,7 @@ import com.twine.tango.dal.TangoDB; public void setDescription(String description) { this.description = description; + notifyPropertyChanged(BR.description); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControl.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControl.java index b49a54ab8..ec2506b57 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControl.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControl.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "HARDWARE_PID_CONTROLS", database = TangoDB.class) @@ -99,6 +101,7 @@ import com.twine.tango.dal.TangoDB; * * return the OutputProportionalPowerLimit */ + @Bindable public int getOutputProportionalPowerLimit() { return outputProportionalPowerLimit; @@ -112,6 +115,7 @@ import com.twine.tango.dal.TangoDB; public void setOutputProportionalPowerLimit(int outputProportionalPowerLimit) { this.outputProportionalPowerLimit = outputProportionalPowerLimit; + notifyPropertyChanged(BR.outputProportionalPowerLimit); } @@ -120,6 +124,7 @@ import com.twine.tango.dal.TangoDB; * * return the OutputProportionalBand */ + @Bindable public int getOutputProportionalBand() { return outputProportionalBand; @@ -133,6 +138,7 @@ import com.twine.tango.dal.TangoDB; public void setOutputProportionalBand(int outputProportionalBand) { this.outputProportionalBand = outputProportionalBand; + notifyPropertyChanged(BR.outputProportionalBand); } @@ -141,6 +147,7 @@ import com.twine.tango.dal.TangoDB; * * return the IntegralTime */ + @Bindable public int getIntegralTime() { return integralTime; @@ -154,6 +161,7 @@ import com.twine.tango.dal.TangoDB; public void setIntegralTime(int integralTime) { this.integralTime = integralTime; + notifyPropertyChanged(BR.integralTime); } @@ -162,6 +170,7 @@ import com.twine.tango.dal.TangoDB; * * return the DerivativeTime */ + @Bindable public int getDerivativeTime() { return derivativeTime; @@ -175,6 +184,7 @@ import com.twine.tango.dal.TangoDB; public void setDerivativeTime(int derivativeTime) { this.derivativeTime = derivativeTime; + notifyPropertyChanged(BR.derivativeTime); } @@ -183,6 +193,7 @@ import com.twine.tango.dal.TangoDB; * * return the SensorCorrectionAdjustment */ + @Bindable public int getSensorCorrectionAdjustment() { return sensorCorrectionAdjustment; @@ -196,6 +207,7 @@ import com.twine.tango.dal.TangoDB; public void setSensorCorrectionAdjustment(int sensorCorrectionAdjustment) { this.sensorCorrectionAdjustment = sensorCorrectionAdjustment; + notifyPropertyChanged(BR.sensorCorrectionAdjustment); } @@ -204,6 +216,7 @@ import com.twine.tango.dal.TangoDB; * * return the SensorMinValue */ + @Bindable public int getSensorMinValue() { return sensorMinValue; @@ -217,6 +230,7 @@ import com.twine.tango.dal.TangoDB; public void setSensorMinValue(int sensorMinValue) { this.sensorMinValue = sensorMinValue; + notifyPropertyChanged(BR.sensorMinValue); } @@ -225,6 +239,7 @@ import com.twine.tango.dal.TangoDB; * * return the SensorMaxValue */ + @Bindable public int getSensorMaxValue() { return sensorMaxValue; @@ -238,6 +253,7 @@ import com.twine.tango.dal.TangoDB; public void setSensorMaxValue(int sensorMaxValue) { this.sensorMaxValue = sensorMaxValue; + notifyPropertyChanged(BR.sensorMaxValue); } @@ -246,6 +262,7 @@ import com.twine.tango.dal.TangoDB; * * return the PointRampRateorSoftStartRamp */ + @Bindable public int getPointRampRateorSoftStartRamp() { return pointRampRateorSoftStartRamp; @@ -259,6 +276,7 @@ import com.twine.tango.dal.TangoDB; public void setPointRampRateorSoftStartRamp(int pointRampRateorSoftStartRamp) { this.pointRampRateorSoftStartRamp = pointRampRateorSoftStartRamp; + notifyPropertyChanged(BR.pointRampRateorSoftStartRamp); } @@ -267,6 +285,7 @@ import com.twine.tango.dal.TangoDB; * * return the PointControlOutputRate */ + @Bindable public int getPointControlOutputRate() { return pointControlOutputRate; @@ -280,6 +299,7 @@ import com.twine.tango.dal.TangoDB; public void setPointControlOutputRate(int pointControlOutputRate) { this.pointControlOutputRate = pointControlOutputRate; + notifyPropertyChanged(BR.pointControlOutputRate); } @@ -288,6 +308,7 @@ import com.twine.tango.dal.TangoDB; * * return the ControlOutputType */ + @Bindable public int getControlOutputType() { return controlOutputType; @@ -301,6 +322,7 @@ import com.twine.tango.dal.TangoDB; public void setControlOutputType(int controlOutputType) { this.controlOutputType = controlOutputType; + notifyPropertyChanged(BR.controlOutputType); } @@ -309,6 +331,7 @@ import com.twine.tango.dal.TangoDB; * * return the SsrControlOutputType */ + @Bindable public int getSsrControlOutputType() { return ssrControlOutputType; @@ -322,6 +345,7 @@ import com.twine.tango.dal.TangoDB; public void setSsrControlOutputType(int ssrControlOutputType) { this.ssrControlOutputType = ssrControlOutputType; + notifyPropertyChanged(BR.ssrControlOutputType); } @@ -330,6 +354,7 @@ import com.twine.tango.dal.TangoDB; * * return the OutputOnOffHysteresisValue */ + @Bindable public int getOutputOnOffHysteresisValue() { return outputOnOffHysteresisValue; @@ -343,6 +368,7 @@ import com.twine.tango.dal.TangoDB; public void setOutputOnOffHysteresisValue(int outputOnOffHysteresisValue) { this.outputOnOffHysteresisValue = outputOnOffHysteresisValue; + notifyPropertyChanged(BR.outputOnOffHysteresisValue); } @@ -351,6 +377,7 @@ import com.twine.tango.dal.TangoDB; * * return the ProcessVariableSamplingRate */ + @Bindable public int getProcessVariableSamplingRate() { return processVariableSamplingRate; @@ -364,6 +391,7 @@ import com.twine.tango.dal.TangoDB; public void setProcessVariableSamplingRate(int processVariableSamplingRate) { this.processVariableSamplingRate = processVariableSamplingRate; + notifyPropertyChanged(BR.processVariableSamplingRate); } @@ -372,6 +400,7 @@ import com.twine.tango.dal.TangoDB; * * return the PvInputFilterFactorMode */ + @Bindable public int getPvInputFilterFactorMode() { return pvInputFilterFactorMode; @@ -385,6 +414,7 @@ import com.twine.tango.dal.TangoDB; public void setPvInputFilterFactorMode(int pvInputFilterFactorMode) { this.pvInputFilterFactorMode = pvInputFilterFactorMode; + notifyPropertyChanged(BR.pvInputFilterFactorMode); } @@ -393,6 +423,7 @@ import com.twine.tango.dal.TangoDB; * * return the HardwarePidControlTypes */ + @Bindable public HardwarePidControlType getHardwarePidControlTypes() { return hardwarePidControlTypes; @@ -406,6 +437,7 @@ import com.twine.tango.dal.TangoDB; public void setHardwarePidControlTypes(HardwarePidControlType hardwarePidControlTypes) { this.hardwarePidControlTypes = hardwarePidControlTypes; + notifyPropertyChanged(BR.hardwarePidControlTypes); } @@ -414,6 +446,7 @@ import com.twine.tango.dal.TangoDB; * * return the HardwareVersions */ + @Bindable public HardwareVersion getHardwareVersions() { return hardwareVersions; @@ -427,6 +460,7 @@ import com.twine.tango.dal.TangoDB; public void setHardwareVersions(HardwareVersion hardwareVersions) { this.hardwareVersions = hardwareVersions; + notifyPropertyChanged(BR.hardwareVersions); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControlType.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControlType.java index b45220633..1237dc13d 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControlType.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControlType.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "HARDWARE_PID_CONTROL_TYPES", database = TangoDB.class) @@ -34,6 +36,7 @@ import com.twine.tango.dal.TangoDB; * * return the Code */ + @Bindable public int getCode() { return code; @@ -47,6 +50,7 @@ import com.twine.tango.dal.TangoDB; public void setCode(int code) { this.code = code; + notifyPropertyChanged(BR.code); } @@ -55,6 +59,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -68,6 +73,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } @@ -76,6 +82,7 @@ import com.twine.tango.dal.TangoDB; * * return the Description */ + @Bindable public String getDescription() { return description; @@ -89,6 +96,7 @@ import com.twine.tango.dal.TangoDB; public void setDescription(String description) { this.description = description; + notifyPropertyChanged(BR.description); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareVersion.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareVersion.java index a6599f20e..5d6dce0d2 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareVersion.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareVersion.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "HARDWARE_VERSIONS", database = TangoDB.class) @@ -14,7 +16,7 @@ import com.twine.tango.dal.TangoDB; { @Column(name = "VERSION") - private Double version; + private double version; @@ -29,7 +31,8 @@ import com.twine.tango.dal.TangoDB; * * return the Version */ - public Double getVersion() + @Bindable + public double getVersion() { return version; } @@ -39,9 +42,10 @@ import com.twine.tango.dal.TangoDB; * * @param version the Version */ - public void setVersion(Double version) + public void setVersion(double version) { this.version = version; + notifyPropertyChanged(BR.version); } @@ -50,6 +54,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -63,6 +68,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinder.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinder.java index 5e48a6a12..889fbf830 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinder.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinder.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "HARDWARE_WINDERS", database = TangoDB.class) @@ -34,6 +36,7 @@ import com.twine.tango.dal.TangoDB; * * return the MillimeterPerRotation */ + @Bindable public int getMillimeterPerRotation() { return millimeterPerRotation; @@ -47,6 +50,7 @@ import com.twine.tango.dal.TangoDB; public void setMillimeterPerRotation(int millimeterPerRotation) { this.millimeterPerRotation = millimeterPerRotation; + notifyPropertyChanged(BR.millimeterPerRotation); } @@ -55,6 +59,7 @@ import com.twine.tango.dal.TangoDB; * * return the HardwareVersions */ + @Bindable public HardwareVersion getHardwareVersions() { return hardwareVersions; @@ -68,6 +73,7 @@ import com.twine.tango.dal.TangoDB; public void setHardwareVersions(HardwareVersion hardwareVersions) { this.hardwareVersions = hardwareVersions; + notifyPropertyChanged(BR.hardwareVersions); } @@ -76,6 +82,7 @@ import com.twine.tango.dal.TangoDB; * * return the HardwareWinderTypes */ + @Bindable public HardwareWinderType getHardwareWinderTypes() { return hardwareWinderTypes; @@ -89,6 +96,7 @@ import com.twine.tango.dal.TangoDB; public void setHardwareWinderTypes(HardwareWinderType hardwareWinderTypes) { this.hardwareWinderTypes = hardwareWinderTypes; + notifyPropertyChanged(BR.hardwareWinderTypes); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinderType.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinderType.java index ba8413632..9b8f7ea99 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinderType.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinderType.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "HARDWARE_WINDER_TYPES", database = TangoDB.class) @@ -34,6 +36,7 @@ import com.twine.tango.dal.TangoDB; * * return the Code */ + @Bindable public int getCode() { return code; @@ -47,6 +50,7 @@ import com.twine.tango.dal.TangoDB; public void setCode(int code) { this.code = code; + notifyPropertyChanged(BR.code); } @@ -55,6 +59,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -68,6 +73,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } @@ -76,6 +82,7 @@ import com.twine.tango.dal.TangoDB; * * return the Description */ + @Bindable public String getDescription() { return description; @@ -89,6 +96,7 @@ import com.twine.tango.dal.TangoDB; public void setDescription(String description) { this.description = description; + notifyPropertyChanged(BR.description); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPack.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPack.java index b86fe96a0..961a08e2b 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPack.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPack.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "IDS_PACKS", database = TangoDB.class) @@ -59,6 +61,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -72,6 +75,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } @@ -80,6 +84,7 @@ import com.twine.tango.dal.TangoDB; * * return the PackIndex */ + @Bindable public int getPackIndex() { return packIndex; @@ -93,6 +98,7 @@ import com.twine.tango.dal.TangoDB; public void setPackIndex(int packIndex) { this.packIndex = packIndex; + notifyPropertyChanged(BR.packIndex); } @@ -101,6 +107,7 @@ import com.twine.tango.dal.TangoDB; * * return the CartridgeTypes */ + @Bindable public CartridgeType getCartridgeTypes() { return cartridgeTypes; @@ -114,6 +121,7 @@ import com.twine.tango.dal.TangoDB; public void setCartridgeTypes(CartridgeType cartridgeTypes) { this.cartridgeTypes = cartridgeTypes; + notifyPropertyChanged(BR.cartridgeTypes); } @@ -122,6 +130,7 @@ import com.twine.tango.dal.TangoDB; * * return the Configuration */ + @Bindable public Configuration getConfiguration() { return configuration; @@ -135,6 +144,7 @@ import com.twine.tango.dal.TangoDB; public void setConfiguration(Configuration configuration) { this.configuration = configuration; + notifyPropertyChanged(BR.configuration); } @@ -143,6 +153,7 @@ import com.twine.tango.dal.TangoDB; * * return the DispenserTypes */ + @Bindable public DispenserType getDispenserTypes() { return dispenserTypes; @@ -156,6 +167,7 @@ import com.twine.tango.dal.TangoDB; public void setDispenserTypes(DispenserType dispenserTypes) { this.dispenserTypes = dispenserTypes; + notifyPropertyChanged(BR.dispenserTypes); } @@ -164,6 +176,7 @@ import com.twine.tango.dal.TangoDB; * * return the IdsPackFormulas */ + @Bindable public IdsPackFormula getIdsPackFormulas() { return idsPackFormulas; @@ -177,6 +190,7 @@ import com.twine.tango.dal.TangoDB; public void setIdsPackFormulas(IdsPackFormula idsPackFormulas) { this.idsPackFormulas = idsPackFormulas; + notifyPropertyChanged(BR.idsPackFormulas); } @@ -185,6 +199,7 @@ import com.twine.tango.dal.TangoDB; * * return the LiquidTypes */ + @Bindable public LiquidType getLiquidTypes() { return liquidTypes; @@ -198,6 +213,7 @@ import com.twine.tango.dal.TangoDB; public void setLiquidTypes(LiquidType liquidTypes) { this.liquidTypes = liquidTypes; + notifyPropertyChanged(BR.liquidTypes); } @@ -206,6 +222,7 @@ import com.twine.tango.dal.TangoDB; * * return the MidTankTypes */ + @Bindable public MidTankType getMidTankTypes() { return midTankTypes; @@ -219,6 +236,7 @@ import com.twine.tango.dal.TangoDB; public void setMidTankTypes(MidTankType midTankTypes) { this.midTankTypes = midTankTypes; + notifyPropertyChanged(BR.midTankTypes); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPackFormula.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPackFormula.java index bd327c56b..1ac479163 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPackFormula.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPackFormula.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "IDS_PACK_FORMULAS", database = TangoDB.class) @@ -29,7 +31,7 @@ import com.twine.tango.dal.TangoDB; @Column(name = "AUTO_CALCULATED") - private Boolean autoCalculated; + private boolean autoCalculated; @@ -39,6 +41,7 @@ import com.twine.tango.dal.TangoDB; * * return the Code */ + @Bindable public int getCode() { return code; @@ -52,6 +55,7 @@ import com.twine.tango.dal.TangoDB; public void setCode(int code) { this.code = code; + notifyPropertyChanged(BR.code); } @@ -60,6 +64,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -73,6 +78,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } @@ -81,6 +87,7 @@ import com.twine.tango.dal.TangoDB; * * return the Description */ + @Bindable public String getDescription() { return description; @@ -94,6 +101,7 @@ import com.twine.tango.dal.TangoDB; public void setDescription(String description) { this.description = description; + notifyPropertyChanged(BR.description); } @@ -102,7 +110,8 @@ import com.twine.tango.dal.TangoDB; * * return the AutoCalculated */ - public Boolean isAutoCalculated() + @Bindable + public boolean isAutoCalculated() { return autoCalculated; } @@ -112,9 +121,10 @@ import com.twine.tango.dal.TangoDB; * * @param autoCalculated the AutoCalculated */ - public void setAutoCalculated(Boolean autoCalculated) + public void setAutoCalculated(boolean autoCalculated) { this.autoCalculated = autoCalculated; + notifyPropertyChanged(BR.autoCalculated); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Job.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Job.java index b8f776d4f..b82a87548 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Job.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Job.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "JOBS", database = TangoDB.class) @@ -29,17 +31,17 @@ import com.twine.tango.dal.TangoDB; @Column(name = "INTER_SEGMENT_LENGTH") - private Double interSegmentLength; + private double interSegmentLength; @Column(name = "ENABLE_INTER_SEGMENT") - private Boolean enableInterSegment; + private boolean enableInterSegment; @Column(name = "ENABLE_LUBRICATION") - private Boolean enableLubrication; + private boolean enableLubrication; @@ -54,7 +56,7 @@ import com.twine.tango.dal.TangoDB; @Column(name = "HAS_EMBROIDERY_FILE") - private Boolean hasEmbroideryFile; + private boolean hasEmbroideryFile; @@ -104,6 +106,7 @@ import com.twine.tango.dal.TangoDB; * * return the CreationDate */ + @Bindable public DateTime getCreationDate() { return creationDate; @@ -117,6 +120,7 @@ import com.twine.tango.dal.TangoDB; public void setCreationDate(DateTime creationDate) { this.creationDate = creationDate; + notifyPropertyChanged(BR.creationDate); } @@ -125,6 +129,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -138,6 +143,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } @@ -146,6 +152,7 @@ import com.twine.tango.dal.TangoDB; * * return the Description */ + @Bindable public String getDescription() { return description; @@ -159,6 +166,7 @@ import com.twine.tango.dal.TangoDB; public void setDescription(String description) { this.description = description; + notifyPropertyChanged(BR.description); } @@ -167,7 +175,8 @@ import com.twine.tango.dal.TangoDB; * * return the InterSegmentLength */ - public Double getInterSegmentLength() + @Bindable + public double getInterSegmentLength() { return interSegmentLength; } @@ -177,9 +186,10 @@ import com.twine.tango.dal.TangoDB; * * @param interSegmentLength the InterSegmentLength */ - public void setInterSegmentLength(Double interSegmentLength) + public void setInterSegmentLength(double interSegmentLength) { this.interSegmentLength = interSegmentLength; + notifyPropertyChanged(BR.interSegmentLength); } @@ -188,7 +198,8 @@ import com.twine.tango.dal.TangoDB; * * return the EnableInterSegment */ - public Boolean isEnableInterSegment() + @Bindable + public boolean isEnableInterSegment() { return enableInterSegment; } @@ -198,9 +209,10 @@ import com.twine.tango.dal.TangoDB; * * @param enableInterSegment the EnableInterSegment */ - public void setEnableInterSegment(Boolean enableInterSegment) + public void setEnableInterSegment(boolean enableInterSegment) { this.enableInterSegment = enableInterSegment; + notifyPropertyChanged(BR.enableInterSegment); } @@ -209,7 +221,8 @@ import com.twine.tango.dal.TangoDB; * * return the EnableLubrication */ - public Boolean isEnableLubrication() + @Bindable + public boolean isEnableLubrication() { return enableLubrication; } @@ -219,9 +232,10 @@ import com.twine.tango.dal.TangoDB; * * @param enableLubrication the EnableLubrication */ - public void setEnableLubrication(Boolean enableLubrication) + public void setEnableLubrication(boolean enableLubrication) { this.enableLubrication = enableLubrication; + notifyPropertyChanged(BR.enableLubrication); } @@ -230,6 +244,7 @@ import com.twine.tango.dal.TangoDB; * * return the JobIndex */ + @Bindable public int getJobIndex() { return jobIndex; @@ -243,6 +258,7 @@ import com.twine.tango.dal.TangoDB; public void setJobIndex(int jobIndex) { this.jobIndex = jobIndex; + notifyPropertyChanged(BR.jobIndex); } @@ -251,6 +267,7 @@ import com.twine.tango.dal.TangoDB; * * return the EstimatedDurationMili */ + @Bindable public int getEstimatedDurationMili() { return estimatedDurationMili; @@ -264,6 +281,7 @@ import com.twine.tango.dal.TangoDB; public void setEstimatedDurationMili(int estimatedDurationMili) { this.estimatedDurationMili = estimatedDurationMili; + notifyPropertyChanged(BR.estimatedDurationMili); } @@ -272,7 +290,8 @@ import com.twine.tango.dal.TangoDB; * * return the HasEmbroideryFile */ - public Boolean isHasEmbroideryFile() + @Bindable + public boolean isHasEmbroideryFile() { return hasEmbroideryFile; } @@ -282,9 +301,10 @@ import com.twine.tango.dal.TangoDB; * * @param hasEmbroideryFile the HasEmbroideryFile */ - public void setHasEmbroideryFile(Boolean hasEmbroideryFile) + public void setHasEmbroideryFile(boolean hasEmbroideryFile) { this.hasEmbroideryFile = hasEmbroideryFile; + notifyPropertyChanged(BR.hasEmbroideryFile); } @@ -293,6 +313,7 @@ import com.twine.tango.dal.TangoDB; * * return the EmbroideryFileData */ + @Bindable public byte[] getEmbroideryFileData() { return embroideryFileData; @@ -306,6 +327,7 @@ import com.twine.tango.dal.TangoDB; public void setEmbroideryFileData(byte[] embroideryFileData) { this.embroideryFileData = embroideryFileData; + notifyPropertyChanged(BR.embroideryFileData); } @@ -314,6 +336,7 @@ import com.twine.tango.dal.TangoDB; * * return the EmbroideryFileName */ + @Bindable public String getEmbroideryFileName() { return embroideryFileName; @@ -327,6 +350,7 @@ import com.twine.tango.dal.TangoDB; public void setEmbroideryFileName(String embroideryFileName) { this.embroideryFileName = embroideryFileName; + notifyPropertyChanged(BR.embroideryFileName); } @@ -335,6 +359,7 @@ import com.twine.tango.dal.TangoDB; * * return the EmbroideryJpeg */ + @Bindable public byte[] getEmbroideryJpeg() { return embroideryJpeg; @@ -348,6 +373,7 @@ import com.twine.tango.dal.TangoDB; public void setEmbroideryJpeg(byte[] embroideryJpeg) { this.embroideryJpeg = embroideryJpeg; + notifyPropertyChanged(BR.embroideryJpeg); } @@ -356,6 +382,7 @@ import com.twine.tango.dal.TangoDB; * * return the Machine */ + @Bindable public Machine getMachine() { return machine; @@ -369,6 +396,7 @@ import com.twine.tango.dal.TangoDB; public void setMachine(Machine machine) { this.machine = machine; + notifyPropertyChanged(BR.machine); } @@ -377,6 +405,7 @@ import com.twine.tango.dal.TangoDB; * * return the Rml */ + @Bindable public Rml getRml() { return rml; @@ -390,6 +419,7 @@ import com.twine.tango.dal.TangoDB; public void setRml(Rml rml) { this.rml = rml; + notifyPropertyChanged(BR.rml); } @@ -398,6 +428,7 @@ import com.twine.tango.dal.TangoDB; * * return the SpoolTypes */ + @Bindable public SpoolType getSpoolTypes() { return spoolTypes; @@ -411,6 +442,7 @@ import com.twine.tango.dal.TangoDB; public void setSpoolTypes(SpoolType spoolTypes) { this.spoolTypes = spoolTypes; + notifyPropertyChanged(BR.spoolTypes); } @@ -419,6 +451,7 @@ import com.twine.tango.dal.TangoDB; * * return the User */ + @Bindable public User getUser() { return user; @@ -432,6 +465,7 @@ import com.twine.tango.dal.TangoDB; public void setUser(User user) { this.user = user; + notifyPropertyChanged(BR.user); } @@ -440,6 +474,7 @@ import com.twine.tango.dal.TangoDB; * * return the WindingMethods */ + @Bindable public WindingMethod getWindingMethods() { return windingMethods; @@ -453,6 +488,7 @@ import com.twine.tango.dal.TangoDB; public void setWindingMethods(WindingMethod windingMethods) { this.windingMethods = windingMethods; + notifyPropertyChanged(BR.windingMethods); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/JobRun.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/JobRun.java index a692ed642..c67f1b496 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/JobRun.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/JobRun.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "JOB_RUNS", database = TangoDB.class) @@ -24,7 +26,7 @@ import com.twine.tango.dal.TangoDB; @Column(name = "SUCCESSFUL") - private Boolean successful; + private boolean successful; @@ -39,6 +41,7 @@ import com.twine.tango.dal.TangoDB; * * return the StartDate */ + @Bindable public DateTime getStartDate() { return startDate; @@ -52,6 +55,7 @@ import com.twine.tango.dal.TangoDB; public void setStartDate(DateTime startDate) { this.startDate = startDate; + notifyPropertyChanged(BR.startDate); } @@ -60,6 +64,7 @@ import com.twine.tango.dal.TangoDB; * * return the EndDate */ + @Bindable public DateTime getEndDate() { return endDate; @@ -73,6 +78,7 @@ import com.twine.tango.dal.TangoDB; public void setEndDate(DateTime endDate) { this.endDate = endDate; + notifyPropertyChanged(BR.endDate); } @@ -81,7 +87,8 @@ import com.twine.tango.dal.TangoDB; * * return the Successful */ - public Boolean isSuccessful() + @Bindable + public boolean isSuccessful() { return successful; } @@ -91,9 +98,10 @@ import com.twine.tango.dal.TangoDB; * * @param successful the Successful */ - public void setSuccessful(Boolean successful) + public void setSuccessful(boolean successful) { this.successful = successful; + notifyPropertyChanged(BR.successful); } @@ -102,6 +110,7 @@ import com.twine.tango.dal.TangoDB; * * return the Job */ + @Bindable public Job getJob() { return job; @@ -115,6 +124,7 @@ import com.twine.tango.dal.TangoDB; public void setJob(Job job) { this.job = job; + notifyPropertyChanged(BR.job); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LinearMassDensityUnit.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LinearMassDensityUnit.java index a88127dd6..b1162c252 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LinearMassDensityUnit.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LinearMassDensityUnit.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "LINEAR_MASS_DENSITY_UNITS", database = TangoDB.class) @@ -29,6 +31,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -42,6 +45,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } @@ -50,6 +54,7 @@ import com.twine.tango.dal.TangoDB; * * return the Code */ + @Bindable public int getCode() { return code; @@ -63,6 +68,7 @@ import com.twine.tango.dal.TangoDB; public void setCode(int code) { this.code = code; + notifyPropertyChanged(BR.code); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidType.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidType.java index 92461e3ed..2e75e30d5 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidType.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidType.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "LIQUID_TYPES", database = TangoDB.class) @@ -24,7 +26,7 @@ import com.twine.tango.dal.TangoDB; @Column(name = "VERSION") - private Double version; + private double version; @@ -39,6 +41,7 @@ import com.twine.tango.dal.TangoDB; * * return the Code */ + @Bindable public int getCode() { return code; @@ -52,6 +55,7 @@ import com.twine.tango.dal.TangoDB; public void setCode(int code) { this.code = code; + notifyPropertyChanged(BR.code); } @@ -60,6 +64,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -73,6 +78,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } @@ -81,7 +87,8 @@ import com.twine.tango.dal.TangoDB; * * return the Version */ - public Double getVersion() + @Bindable + public double getVersion() { return version; } @@ -91,9 +98,10 @@ import com.twine.tango.dal.TangoDB; * * @param version the Version */ - public void setVersion(Double version) + public void setVersion(double version) { this.version = version; + notifyPropertyChanged(BR.version); } @@ -102,6 +110,7 @@ import com.twine.tango.dal.TangoDB; * * return the Color */ + @Bindable public int getColor() { return color; @@ -115,6 +124,7 @@ import com.twine.tango.dal.TangoDB; public void setColor(int color) { this.color = color; + notifyPropertyChanged(BR.color); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidTypesRml.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidTypesRml.java index b708557fb..b3109182b 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidTypesRml.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidTypesRml.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "LIQUID_TYPES_RMLS", database = TangoDB.class) @@ -14,7 +16,7 @@ import com.twine.tango.dal.TangoDB; { @Column(name = "MAX_NL_PER_CM") - private Double maxNlPerCm; + private double maxNlPerCm; @@ -34,7 +36,8 @@ import com.twine.tango.dal.TangoDB; * * return the MaxNlPerCm */ - public Double getMaxNlPerCm() + @Bindable + public double getMaxNlPerCm() { return maxNlPerCm; } @@ -44,9 +47,10 @@ import com.twine.tango.dal.TangoDB; * * @param maxNlPerCm the MaxNlPerCm */ - public void setMaxNlPerCm(Double maxNlPerCm) + public void setMaxNlPerCm(double maxNlPerCm) { this.maxNlPerCm = maxNlPerCm; + notifyPropertyChanged(BR.maxNlPerCm); } @@ -55,6 +59,7 @@ import com.twine.tango.dal.TangoDB; * * return the LiquidTypes */ + @Bindable public LiquidType getLiquidTypes() { return liquidTypes; @@ -68,6 +73,7 @@ import com.twine.tango.dal.TangoDB; public void setLiquidTypes(LiquidType liquidTypes) { this.liquidTypes = liquidTypes; + notifyPropertyChanged(BR.liquidTypes); } @@ -76,6 +82,7 @@ import com.twine.tango.dal.TangoDB; * * return the Rml */ + @Bindable public Rml getRml() { return rml; @@ -89,6 +96,7 @@ import com.twine.tango.dal.TangoDB; public void setRml(Rml rml) { this.rml = rml; + notifyPropertyChanged(BR.rml); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Machine.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Machine.java index 5f0273fc0..a581c52f3 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Machine.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Machine.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "MACHINES", database = TangoDB.class) @@ -34,7 +36,7 @@ import com.twine.tango.dal.TangoDB; @Column(name = "SYNCHED") - private Boolean synched; + private boolean synched; @@ -59,6 +61,7 @@ import com.twine.tango.dal.TangoDB; * * return the SerialNumber */ + @Bindable public String getSerialNumber() { return serialNumber; @@ -72,6 +75,7 @@ import com.twine.tango.dal.TangoDB; public void setSerialNumber(String serialNumber) { this.serialNumber = serialNumber; + notifyPropertyChanged(BR.serialNumber); } @@ -80,6 +84,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -93,6 +98,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } @@ -101,6 +107,7 @@ import com.twine.tango.dal.TangoDB; * * return the ProductionDate */ + @Bindable public DateTime getProductionDate() { return productionDate; @@ -114,6 +121,7 @@ import com.twine.tango.dal.TangoDB; public void setProductionDate(DateTime productionDate) { this.productionDate = productionDate; + notifyPropertyChanged(BR.productionDate); } @@ -122,6 +130,7 @@ import com.twine.tango.dal.TangoDB; * * return the ExternalBridgePassword */ + @Bindable public String getExternalBridgePassword() { return externalBridgePassword; @@ -135,6 +144,7 @@ import com.twine.tango.dal.TangoDB; public void setExternalBridgePassword(String externalBridgePassword) { this.externalBridgePassword = externalBridgePassword; + notifyPropertyChanged(BR.externalBridgePassword); } @@ -143,7 +153,8 @@ import com.twine.tango.dal.TangoDB; * * return the Synched */ - public Boolean isSynched() + @Bindable + public boolean isSynched() { return synched; } @@ -153,9 +164,10 @@ import com.twine.tango.dal.TangoDB; * * @param synched the Synched */ - public void setSynched(Boolean synched) + public void setSynched(boolean synched) { this.synched = synched; + notifyPropertyChanged(BR.synched); } @@ -164,6 +176,7 @@ import com.twine.tango.dal.TangoDB; * * return the Configuration */ + @Bindable public Configuration getConfiguration() { return configuration; @@ -177,6 +190,7 @@ import com.twine.tango.dal.TangoDB; public void setConfiguration(Configuration configuration) { this.configuration = configuration; + notifyPropertyChanged(BR.configuration); } @@ -185,6 +199,7 @@ import com.twine.tango.dal.TangoDB; * * return the MachineVersions */ + @Bindable public MachineVersion getMachineVersions() { return machineVersions; @@ -198,6 +213,7 @@ import com.twine.tango.dal.TangoDB; public void setMachineVersions(MachineVersion machineVersions) { this.machineVersions = machineVersions; + notifyPropertyChanged(BR.machineVersions); } @@ -206,6 +222,7 @@ import com.twine.tango.dal.TangoDB; * * return the Organization */ + @Bindable public Organization getOrganization() { return organization; @@ -219,6 +236,7 @@ import com.twine.tango.dal.TangoDB; public void setOrganization(Organization organization) { this.organization = organization; + notifyPropertyChanged(BR.organization); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineStudioVersion.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineStudioVersion.java index 1eb254fa6..5090163c2 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineStudioVersion.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineStudioVersion.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "MACHINE_STUDIO_VERSIONS", database = TangoDB.class) @@ -39,6 +41,7 @@ import com.twine.tango.dal.TangoDB; * * return the Version */ + @Bindable public String getVersion() { return version; @@ -52,6 +55,7 @@ import com.twine.tango.dal.TangoDB; public void setVersion(String version) { this.version = version; + notifyPropertyChanged(BR.version); } @@ -60,6 +64,7 @@ import com.twine.tango.dal.TangoDB; * * return the FtpFilePath */ + @Bindable public String getFtpFilePath() { return ftpFilePath; @@ -73,6 +78,7 @@ import com.twine.tango.dal.TangoDB; public void setFtpFilePath(String ftpFilePath) { this.ftpFilePath = ftpFilePath; + notifyPropertyChanged(BR.ftpFilePath); } @@ -81,6 +87,7 @@ import com.twine.tango.dal.TangoDB; * * return the Comments */ + @Bindable public String getComments() { return comments; @@ -94,6 +101,7 @@ import com.twine.tango.dal.TangoDB; public void setComments(String comments) { this.comments = comments; + notifyPropertyChanged(BR.comments); } @@ -102,6 +110,7 @@ import com.twine.tango.dal.TangoDB; * * return the User */ + @Bindable public User getUser() { return user; @@ -115,6 +124,7 @@ import com.twine.tango.dal.TangoDB; public void setUser(User user) { this.user = user; + notifyPropertyChanged(BR.user); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineVersion.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineVersion.java index 832428f73..cdc1b3643 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineVersion.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineVersion.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "MACHINE_VERSIONS", database = TangoDB.class) @@ -14,7 +16,7 @@ import com.twine.tango.dal.TangoDB; { @Column(name = "VERSION") - private Double version; + private double version; @@ -34,7 +36,8 @@ import com.twine.tango.dal.TangoDB; * * return the Version */ - public Double getVersion() + @Bindable + public double getVersion() { return version; } @@ -44,9 +47,10 @@ import com.twine.tango.dal.TangoDB; * * @param version the Version */ - public void setVersion(Double version) + public void setVersion(double version) { this.version = version; + notifyPropertyChanged(BR.version); } @@ -55,6 +59,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -68,6 +73,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } @@ -76,6 +82,7 @@ import com.twine.tango.dal.TangoDB; * * return the Configuration */ + @Bindable public Configuration getConfiguration() { return configuration; @@ -89,6 +96,7 @@ import com.twine.tango.dal.TangoDB; public void setConfiguration(Configuration configuration) { this.configuration = configuration; + notifyPropertyChanged(BR.configuration); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesConfiguration.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesConfiguration.java index 1325eb93a..3e32280f9 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesConfiguration.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesConfiguration.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "MACHINES_CONFIGURATIONS", database = TangoDB.class) @@ -29,6 +31,7 @@ import com.twine.tango.dal.TangoDB; * * return the Configuration */ + @Bindable public Configuration getConfiguration() { return configuration; @@ -42,6 +45,7 @@ import com.twine.tango.dal.TangoDB; public void setConfiguration(Configuration configuration) { this.configuration = configuration; + notifyPropertyChanged(BR.configuration); } @@ -50,6 +54,7 @@ import com.twine.tango.dal.TangoDB; * * return the Machine */ + @Bindable public Machine getMachine() { return machine; @@ -63,6 +68,7 @@ import com.twine.tango.dal.TangoDB; public void setMachine(Machine machine) { this.machine = machine; + notifyPropertyChanged(BR.machine); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesEvent.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesEvent.java index 006711a50..993f03906 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesEvent.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesEvent.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "MACHINES_EVENTS", database = TangoDB.class) @@ -49,6 +51,7 @@ import com.twine.tango.dal.TangoDB; * * return the HostName */ + @Bindable public String getHostName() { return hostName; @@ -62,6 +65,7 @@ import com.twine.tango.dal.TangoDB; public void setHostName(String hostName) { this.hostName = hostName; + notifyPropertyChanged(BR.hostName); } @@ -70,6 +74,7 @@ import com.twine.tango.dal.TangoDB; * * return the DateTime */ + @Bindable public DateTime getDateTime() { return dateTime; @@ -83,6 +88,7 @@ import com.twine.tango.dal.TangoDB; public void setDateTime(DateTime dateTime) { this.dateTime = dateTime; + notifyPropertyChanged(BR.dateTime); } @@ -91,6 +97,7 @@ import com.twine.tango.dal.TangoDB; * * return the Description */ + @Bindable public String getDescription() { return description; @@ -104,6 +111,7 @@ import com.twine.tango.dal.TangoDB; public void setDescription(String description) { this.description = description; + notifyPropertyChanged(BR.description); } @@ -112,6 +120,7 @@ import com.twine.tango.dal.TangoDB; * * return the EventTypes */ + @Bindable public EventType getEventTypes() { return eventTypes; @@ -125,6 +134,7 @@ import com.twine.tango.dal.TangoDB; public void setEventTypes(EventType eventTypes) { this.eventTypes = eventTypes; + notifyPropertyChanged(BR.eventTypes); } @@ -133,6 +143,7 @@ import com.twine.tango.dal.TangoDB; * * return the Machine */ + @Bindable public Machine getMachine() { return machine; @@ -146,6 +157,7 @@ import com.twine.tango.dal.TangoDB; public void setMachine(Machine machine) { this.machine = machine; + notifyPropertyChanged(BR.machine); } @@ -154,6 +166,7 @@ import com.twine.tango.dal.TangoDB; * * return the User */ + @Bindable public User getUser() { return user; @@ -167,6 +180,7 @@ import com.twine.tango.dal.TangoDB; public void setUser(User user) { this.user = user; + notifyPropertyChanged(BR.user); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaColor.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaColor.java index 26e1a8ccb..95d1e8001 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaColor.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaColor.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "MEDIA_COLORS", database = TangoDB.class) @@ -19,17 +21,17 @@ import com.twine.tango.dal.TangoDB; @Column(name = "L") - private Double l; + private double l; @Column(name = "A") - private Double a; + private double a; @Column(name = "B") - private Double b; + private double b; @@ -39,6 +41,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -52,6 +55,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } @@ -60,7 +64,8 @@ import com.twine.tango.dal.TangoDB; * * return the L */ - public Double getL() + @Bindable + public double getL() { return l; } @@ -70,9 +75,10 @@ import com.twine.tango.dal.TangoDB; * * @param l the L */ - public void setL(Double l) + public void setL(double l) { this.l = l; + notifyPropertyChanged(BR.l); } @@ -81,7 +87,8 @@ import com.twine.tango.dal.TangoDB; * * return the A */ - public Double getA() + @Bindable + public double getA() { return a; } @@ -91,9 +98,10 @@ import com.twine.tango.dal.TangoDB; * * @param a the A */ - public void setA(Double a) + public void setA(double a) { this.a = a; + notifyPropertyChanged(BR.a); } @@ -102,7 +110,8 @@ import com.twine.tango.dal.TangoDB; * * return the B */ - public Double getB() + @Bindable + public double getB() { return b; } @@ -112,9 +121,10 @@ import com.twine.tango.dal.TangoDB; * * @param b the B */ - public void setB(Double b) + public void setB(double b) { this.b = b; + notifyPropertyChanged(BR.b); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaCondition.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaCondition.java index 405eb81b4..bf2c00155 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaCondition.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaCondition.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "MEDIA_CONDITIONS", database = TangoDB.class) @@ -29,6 +31,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -42,6 +45,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } @@ -50,6 +54,7 @@ import com.twine.tango.dal.TangoDB; * * return the Code */ + @Bindable public int getCode() { return code; @@ -63,6 +68,7 @@ import com.twine.tango.dal.TangoDB; public void setCode(int code) { this.code = code; + notifyPropertyChanged(BR.code); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaMaterial.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaMaterial.java index 2b3e4a333..532491822 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaMaterial.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaMaterial.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "MEDIA_MATERIALS", database = TangoDB.class) @@ -29,6 +31,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -42,6 +45,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } @@ -50,6 +54,7 @@ import com.twine.tango.dal.TangoDB; * * return the Code */ + @Bindable public int getCode() { return code; @@ -63,6 +68,7 @@ import com.twine.tango.dal.TangoDB; public void setCode(int code) { this.code = code; + notifyPropertyChanged(BR.code); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaPurpose.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaPurpose.java index e2e8f81b7..b7efae74b 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaPurpose.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaPurpose.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "MEDIA_PURPOSES", database = TangoDB.class) @@ -29,6 +31,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -42,6 +45,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } @@ -50,6 +54,7 @@ import com.twine.tango.dal.TangoDB; * * return the Code */ + @Bindable public int getCode() { return code; @@ -63,6 +68,7 @@ import com.twine.tango.dal.TangoDB; public void setCode(int code) { this.code = code; + notifyPropertyChanged(BR.code); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MidTankType.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MidTankType.java index a934ee8f6..560194702 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MidTankType.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MidTankType.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "MID_TANK_TYPES", database = TangoDB.class) @@ -24,7 +26,7 @@ import com.twine.tango.dal.TangoDB; @Column(name = "LITER_CAPACITY") - private Double literCapacity; + private double literCapacity; @@ -34,6 +36,7 @@ import com.twine.tango.dal.TangoDB; * * return the Code */ + @Bindable public int getCode() { return code; @@ -47,6 +50,7 @@ import com.twine.tango.dal.TangoDB; public void setCode(int code) { this.code = code; + notifyPropertyChanged(BR.code); } @@ -55,6 +59,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -68,6 +73,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } @@ -76,7 +82,8 @@ import com.twine.tango.dal.TangoDB; * * return the LiterCapacity */ - public Double getLiterCapacity() + @Bindable + public double getLiterCapacity() { return literCapacity; } @@ -86,9 +93,10 @@ import com.twine.tango.dal.TangoDB; * * @param literCapacity the LiterCapacity */ - public void setLiterCapacity(Double literCapacity) + public void setLiterCapacity(double literCapacity) { this.literCapacity = literCapacity; + notifyPropertyChanged(BR.literCapacity); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Organization.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Organization.java index 4cc0e0955..3d1c027fb 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Organization.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Organization.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "ORGANIZATIONS", database = TangoDB.class) @@ -34,6 +36,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -47,6 +50,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } @@ -55,6 +59,7 @@ import com.twine.tango.dal.TangoDB; * * return the Address */ + @Bindable public Address getAddress() { return address; @@ -68,6 +73,7 @@ import com.twine.tango.dal.TangoDB; public void setAddress(Address address) { this.address = address; + notifyPropertyChanged(BR.address); } @@ -76,6 +82,7 @@ import com.twine.tango.dal.TangoDB; * * return the Contact */ + @Bindable public Contact getContact() { return contact; @@ -89,6 +96,7 @@ import com.twine.tango.dal.TangoDB; public void setContact(Contact contact) { this.contact = contact; + notifyPropertyChanged(BR.contact); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Permission.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Permission.java index 993ca374e..0ecc361f3 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Permission.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Permission.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "PERMISSIONS", database = TangoDB.class) @@ -34,6 +36,7 @@ import com.twine.tango.dal.TangoDB; * * return the Code */ + @Bindable public int getCode() { return code; @@ -47,6 +50,7 @@ import com.twine.tango.dal.TangoDB; public void setCode(int code) { this.code = code; + notifyPropertyChanged(BR.code); } @@ -55,6 +59,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -68,6 +73,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } @@ -76,6 +82,7 @@ import com.twine.tango.dal.TangoDB; * * return the Description */ + @Bindable public String getDescription() { return description; @@ -89,6 +96,7 @@ import com.twine.tango.dal.TangoDB; public void setDescription(String description) { this.description = description; + notifyPropertyChanged(BR.description); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTable.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTable.java index 2cf2b0bc0..40200fed5 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTable.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTable.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "PROCESS_PARAMETERS_TABLES", database = TangoDB.class) @@ -19,77 +21,77 @@ import com.twine.tango.dal.TangoDB; @Column(name = "DYEING_SPEED") - private Double dyeingSpeed; + private double dyeingSpeed; @Column(name = "MIXER_TEMP") - private Double mixerTemp; + private double mixerTemp; @Column(name = "DRYER_BUFFER_LENGTH") - private Double dryerBufferLength; + private double dryerBufferLength; @Column(name = "MIN_INK_UPTAKE") - private Double minInkUptake; + private double minInkUptake; @Column(name = "HEAD_ZONE1_TEMP") - private Double headZone1Temp; + private double headZone1Temp; @Column(name = "DRYER_ZONE1_TEMP") - private Double dryerZone1Temp; + private double dryerZone1Temp; @Column(name = "FEEDER_TENSION") - private Double feederTension; + private double feederTension; @Column(name = "DRYER_ZONE2_TEMP") - private Double dryerZone2Temp; + private double dryerZone2Temp; @Column(name = "HEAD_ZONE2_TEMP") - private Double headZone2Temp; + private double headZone2Temp; @Column(name = "PULLER_TENSION") - private Double pullerTension; + private double pullerTension; @Column(name = "HEAD_ZONE3_TEMP") - private Double headZone3Temp; + private double headZone3Temp; @Column(name = "DRYER_ZONE3_TEMP") - private Double dryerZone3Temp; + private double dryerZone3Temp; @Column(name = "WINDER_TENSION") - private Double winderTension; + private double winderTension; @Column(name = "HEAD_AIR_FLOW") - private Double headAirFlow; + private double headAirFlow; @Column(name = "DRYER_AIR_FLOW") - private Double dryerAirFlow; + private double dryerAirFlow; @@ -109,6 +111,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -122,6 +125,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } @@ -130,7 +134,8 @@ import com.twine.tango.dal.TangoDB; * * return the DyeingSpeed */ - public Double getDyeingSpeed() + @Bindable + public double getDyeingSpeed() { return dyeingSpeed; } @@ -140,9 +145,10 @@ import com.twine.tango.dal.TangoDB; * * @param dyeingSpeed the DyeingSpeed */ - public void setDyeingSpeed(Double dyeingSpeed) + public void setDyeingSpeed(double dyeingSpeed) { this.dyeingSpeed = dyeingSpeed; + notifyPropertyChanged(BR.dyeingSpeed); } @@ -151,7 +157,8 @@ import com.twine.tango.dal.TangoDB; * * return the MixerTemp */ - public Double getMixerTemp() + @Bindable + public double getMixerTemp() { return mixerTemp; } @@ -161,9 +168,10 @@ import com.twine.tango.dal.TangoDB; * * @param mixerTemp the MixerTemp */ - public void setMixerTemp(Double mixerTemp) + public void setMixerTemp(double mixerTemp) { this.mixerTemp = mixerTemp; + notifyPropertyChanged(BR.mixerTemp); } @@ -172,7 +180,8 @@ import com.twine.tango.dal.TangoDB; * * return the DryerBufferLength */ - public Double getDryerBufferLength() + @Bindable + public double getDryerBufferLength() { return dryerBufferLength; } @@ -182,9 +191,10 @@ import com.twine.tango.dal.TangoDB; * * @param dryerBufferLength the DryerBufferLength */ - public void setDryerBufferLength(Double dryerBufferLength) + public void setDryerBufferLength(double dryerBufferLength) { this.dryerBufferLength = dryerBufferLength; + notifyPropertyChanged(BR.dryerBufferLength); } @@ -193,7 +203,8 @@ import com.twine.tango.dal.TangoDB; * * return the MinInkUptake */ - public Double getMinInkUptake() + @Bindable + public double getMinInkUptake() { return minInkUptake; } @@ -203,9 +214,10 @@ import com.twine.tango.dal.TangoDB; * * @param minInkUptake the MinInkUptake */ - public void setMinInkUptake(Double minInkUptake) + public void setMinInkUptake(double minInkUptake) { this.minInkUptake = minInkUptake; + notifyPropertyChanged(BR.minInkUptake); } @@ -214,7 +226,8 @@ import com.twine.tango.dal.TangoDB; * * return the HeadZone1Temp */ - public Double getHeadZone1Temp() + @Bindable + public double getHeadZone1Temp() { return headZone1Temp; } @@ -224,9 +237,10 @@ import com.twine.tango.dal.TangoDB; * * @param headZone1Temp the HeadZone1Temp */ - public void setHeadZone1Temp(Double headZone1Temp) + public void setHeadZone1Temp(double headZone1Temp) { this.headZone1Temp = headZone1Temp; + notifyPropertyChanged(BR.headZone1Temp); } @@ -235,7 +249,8 @@ import com.twine.tango.dal.TangoDB; * * return the DryerZone1Temp */ - public Double getDryerZone1Temp() + @Bindable + public double getDryerZone1Temp() { return dryerZone1Temp; } @@ -245,9 +260,10 @@ import com.twine.tango.dal.TangoDB; * * @param dryerZone1Temp the DryerZone1Temp */ - public void setDryerZone1Temp(Double dryerZone1Temp) + public void setDryerZone1Temp(double dryerZone1Temp) { this.dryerZone1Temp = dryerZone1Temp; + notifyPropertyChanged(BR.dryerZone1Temp); } @@ -256,7 +272,8 @@ import com.twine.tango.dal.TangoDB; * * return the FeederTension */ - public Double getFeederTension() + @Bindable + public double getFeederTension() { return feederTension; } @@ -266,9 +283,10 @@ import com.twine.tango.dal.TangoDB; * * @param feederTension the FeederTension */ - public void setFeederTension(Double feederTension) + public void setFeederTension(double feederTension) { this.feederTension = feederTension; + notifyPropertyChanged(BR.feederTension); } @@ -277,7 +295,8 @@ import com.twine.tango.dal.TangoDB; * * return the DryerZone2Temp */ - public Double getDryerZone2Temp() + @Bindable + public double getDryerZone2Temp() { return dryerZone2Temp; } @@ -287,9 +306,10 @@ import com.twine.tango.dal.TangoDB; * * @param dryerZone2Temp the DryerZone2Temp */ - public void setDryerZone2Temp(Double dryerZone2Temp) + public void setDryerZone2Temp(double dryerZone2Temp) { this.dryerZone2Temp = dryerZone2Temp; + notifyPropertyChanged(BR.dryerZone2Temp); } @@ -298,7 +318,8 @@ import com.twine.tango.dal.TangoDB; * * return the HeadZone2Temp */ - public Double getHeadZone2Temp() + @Bindable + public double getHeadZone2Temp() { return headZone2Temp; } @@ -308,9 +329,10 @@ import com.twine.tango.dal.TangoDB; * * @param headZone2Temp the HeadZone2Temp */ - public void setHeadZone2Temp(Double headZone2Temp) + public void setHeadZone2Temp(double headZone2Temp) { this.headZone2Temp = headZone2Temp; + notifyPropertyChanged(BR.headZone2Temp); } @@ -319,7 +341,8 @@ import com.twine.tango.dal.TangoDB; * * return the PullerTension */ - public Double getPullerTension() + @Bindable + public double getPullerTension() { return pullerTension; } @@ -329,9 +352,10 @@ import com.twine.tango.dal.TangoDB; * * @param pullerTension the PullerTension */ - public void setPullerTension(Double pullerTension) + public void setPullerTension(double pullerTension) { this.pullerTension = pullerTension; + notifyPropertyChanged(BR.pullerTension); } @@ -340,7 +364,8 @@ import com.twine.tango.dal.TangoDB; * * return the HeadZone3Temp */ - public Double getHeadZone3Temp() + @Bindable + public double getHeadZone3Temp() { return headZone3Temp; } @@ -350,9 +375,10 @@ import com.twine.tango.dal.TangoDB; * * @param headZone3Temp the HeadZone3Temp */ - public void setHeadZone3Temp(Double headZone3Temp) + public void setHeadZone3Temp(double headZone3Temp) { this.headZone3Temp = headZone3Temp; + notifyPropertyChanged(BR.headZone3Temp); } @@ -361,7 +387,8 @@ import com.twine.tango.dal.TangoDB; * * return the DryerZone3Temp */ - public Double getDryerZone3Temp() + @Bindable + public double getDryerZone3Temp() { return dryerZone3Temp; } @@ -371,9 +398,10 @@ import com.twine.tango.dal.TangoDB; * * @param dryerZone3Temp the DryerZone3Temp */ - public void setDryerZone3Temp(Double dryerZone3Temp) + public void setDryerZone3Temp(double dryerZone3Temp) { this.dryerZone3Temp = dryerZone3Temp; + notifyPropertyChanged(BR.dryerZone3Temp); } @@ -382,7 +410,8 @@ import com.twine.tango.dal.TangoDB; * * return the WinderTension */ - public Double getWinderTension() + @Bindable + public double getWinderTension() { return winderTension; } @@ -392,9 +421,10 @@ import com.twine.tango.dal.TangoDB; * * @param winderTension the WinderTension */ - public void setWinderTension(Double winderTension) + public void setWinderTension(double winderTension) { this.winderTension = winderTension; + notifyPropertyChanged(BR.winderTension); } @@ -403,7 +433,8 @@ import com.twine.tango.dal.TangoDB; * * return the HeadAirFlow */ - public Double getHeadAirFlow() + @Bindable + public double getHeadAirFlow() { return headAirFlow; } @@ -413,9 +444,10 @@ import com.twine.tango.dal.TangoDB; * * @param headAirFlow the HeadAirFlow */ - public void setHeadAirFlow(Double headAirFlow) + public void setHeadAirFlow(double headAirFlow) { this.headAirFlow = headAirFlow; + notifyPropertyChanged(BR.headAirFlow); } @@ -424,7 +456,8 @@ import com.twine.tango.dal.TangoDB; * * return the DryerAirFlow */ - public Double getDryerAirFlow() + @Bindable + public double getDryerAirFlow() { return dryerAirFlow; } @@ -434,9 +467,10 @@ import com.twine.tango.dal.TangoDB; * * @param dryerAirFlow the DryerAirFlow */ - public void setDryerAirFlow(Double dryerAirFlow) + public void setDryerAirFlow(double dryerAirFlow) { this.dryerAirFlow = dryerAirFlow; + notifyPropertyChanged(BR.dryerAirFlow); } @@ -445,6 +479,7 @@ import com.twine.tango.dal.TangoDB; * * return the TableIndex */ + @Bindable public int getTableIndex() { return tableIndex; @@ -458,6 +493,7 @@ import com.twine.tango.dal.TangoDB; public void setTableIndex(int tableIndex) { this.tableIndex = tableIndex; + notifyPropertyChanged(BR.tableIndex); } @@ -466,6 +502,7 @@ import com.twine.tango.dal.TangoDB; * * return the ProcessParametersTablesGroups */ + @Bindable public ProcessParametersTablesGroup getProcessParametersTablesGroups() { return processParametersTablesGroups; @@ -479,6 +516,7 @@ import com.twine.tango.dal.TangoDB; public void setProcessParametersTablesGroups(ProcessParametersTablesGroup processParametersTablesGroups) { this.processParametersTablesGroups = processParametersTablesGroups; + notifyPropertyChanged(BR.processParametersTablesGroups); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTablesGroup.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTablesGroup.java index 734847f71..bed5eb05e 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTablesGroup.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTablesGroup.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "PROCESS_PARAMETERS_TABLES_GROUPS", database = TangoDB.class) @@ -19,7 +21,7 @@ import com.twine.tango.dal.TangoDB; @Column(name = "ACTIVE") - private Boolean active; + private boolean active; @@ -39,6 +41,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -52,6 +55,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } @@ -60,7 +64,8 @@ import com.twine.tango.dal.TangoDB; * * return the Active */ - public Boolean isActive() + @Bindable + public boolean isActive() { return active; } @@ -70,9 +75,10 @@ import com.twine.tango.dal.TangoDB; * * @param active the Active */ - public void setActive(Boolean active) + public void setActive(boolean active) { this.active = active; + notifyPropertyChanged(BR.active); } @@ -81,6 +87,7 @@ import com.twine.tango.dal.TangoDB; * * return the SaveDate */ + @Bindable public DateTime getSaveDate() { return saveDate; @@ -94,6 +101,7 @@ import com.twine.tango.dal.TangoDB; public void setSaveDate(DateTime saveDate) { this.saveDate = saveDate; + notifyPropertyChanged(BR.saveDate); } @@ -102,6 +110,7 @@ import com.twine.tango.dal.TangoDB; * * return the Rml */ + @Bindable public Rml getRml() { return rml; @@ -115,6 +124,7 @@ import com.twine.tango.dal.TangoDB; public void setRml(Rml rml) { this.rml = rml; + notifyPropertyChanged(BR.rml); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Rml.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Rml.java index afaf75389..e0116628f 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Rml.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Rml.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "RMLS", database = TangoDB.class) @@ -29,7 +31,7 @@ import com.twine.tango.dal.TangoDB; @Column(name = "FIBER_SIZE") - private Double fiberSize; + private double fiberSize; @@ -49,32 +51,32 @@ import com.twine.tango.dal.TangoDB; @Column(name = "TWISTED") - private Boolean twisted; + private boolean twisted; @Column(name = "AIR_ENTANGLEMENT") - private Boolean airEntanglement; + private boolean airEntanglement; @Column(name = "LUBRICANT") - private Boolean lubricant; + private boolean lubricant; @Column(name = "TENSILE_STRENGTH") - private Double tensileStrength; + private double tensileStrength; @Column(name = "ELONGATION_AT_BREAK_PERCENTAGE") - private Double elongationAtBreakPercentage; + private double elongationAtBreakPercentage; @Column(name = "ESTIMATED_THREAD_DIAMETER") - private Double estimatedThreadDiameter; + private double estimatedThreadDiameter; @@ -119,6 +121,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -132,6 +135,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } @@ -140,6 +144,7 @@ import com.twine.tango.dal.TangoDB; * * return the Manufacturer */ + @Bindable public String getManufacturer() { return manufacturer; @@ -153,6 +158,7 @@ import com.twine.tango.dal.TangoDB; public void setManufacturer(String manufacturer) { this.manufacturer = manufacturer; + notifyPropertyChanged(BR.manufacturer); } @@ -161,6 +167,7 @@ import com.twine.tango.dal.TangoDB; * * return the Code */ + @Bindable public int getCode() { return code; @@ -174,6 +181,7 @@ import com.twine.tango.dal.TangoDB; public void setCode(int code) { this.code = code; + notifyPropertyChanged(BR.code); } @@ -182,7 +190,8 @@ import com.twine.tango.dal.TangoDB; * * return the FiberSize */ - public Double getFiberSize() + @Bindable + public double getFiberSize() { return fiberSize; } @@ -192,9 +201,10 @@ import com.twine.tango.dal.TangoDB; * * @param fiberSize the FiberSize */ - public void setFiberSize(Double fiberSize) + public void setFiberSize(double fiberSize) { this.fiberSize = fiberSize; + notifyPropertyChanged(BR.fiberSize); } @@ -203,6 +213,7 @@ import com.twine.tango.dal.TangoDB; * * return the NumberOfFibers */ + @Bindable public int getNumberOfFibers() { return numberOfFibers; @@ -216,6 +227,7 @@ import com.twine.tango.dal.TangoDB; public void setNumberOfFibers(int numberOfFibers) { this.numberOfFibers = numberOfFibers; + notifyPropertyChanged(BR.numberOfFibers); } @@ -224,6 +236,7 @@ import com.twine.tango.dal.TangoDB; * * return the PliesPerFiber */ + @Bindable public int getPliesPerFiber() { return pliesPerFiber; @@ -237,6 +250,7 @@ import com.twine.tango.dal.TangoDB; public void setPliesPerFiber(int pliesPerFiber) { this.pliesPerFiber = pliesPerFiber; + notifyPropertyChanged(BR.pliesPerFiber); } @@ -245,6 +259,7 @@ import com.twine.tango.dal.TangoDB; * * return the PliesPerThread */ + @Bindable public int getPliesPerThread() { return pliesPerThread; @@ -258,6 +273,7 @@ import com.twine.tango.dal.TangoDB; public void setPliesPerThread(int pliesPerThread) { this.pliesPerThread = pliesPerThread; + notifyPropertyChanged(BR.pliesPerThread); } @@ -266,7 +282,8 @@ import com.twine.tango.dal.TangoDB; * * return the Twisted */ - public Boolean isTwisted() + @Bindable + public boolean isTwisted() { return twisted; } @@ -276,9 +293,10 @@ import com.twine.tango.dal.TangoDB; * * @param twisted the Twisted */ - public void setTwisted(Boolean twisted) + public void setTwisted(boolean twisted) { this.twisted = twisted; + notifyPropertyChanged(BR.twisted); } @@ -287,7 +305,8 @@ import com.twine.tango.dal.TangoDB; * * return the AirEntanglement */ - public Boolean isAirEntanglement() + @Bindable + public boolean isAirEntanglement() { return airEntanglement; } @@ -297,9 +316,10 @@ import com.twine.tango.dal.TangoDB; * * @param airEntanglement the AirEntanglement */ - public void setAirEntanglement(Boolean airEntanglement) + public void setAirEntanglement(boolean airEntanglement) { this.airEntanglement = airEntanglement; + notifyPropertyChanged(BR.airEntanglement); } @@ -308,7 +328,8 @@ import com.twine.tango.dal.TangoDB; * * return the Lubricant */ - public Boolean isLubricant() + @Bindable + public boolean isLubricant() { return lubricant; } @@ -318,9 +339,10 @@ import com.twine.tango.dal.TangoDB; * * @param lubricant the Lubricant */ - public void setLubricant(Boolean lubricant) + public void setLubricant(boolean lubricant) { this.lubricant = lubricant; + notifyPropertyChanged(BR.lubricant); } @@ -329,7 +351,8 @@ import com.twine.tango.dal.TangoDB; * * return the TensileStrength */ - public Double getTensileStrength() + @Bindable + public double getTensileStrength() { return tensileStrength; } @@ -339,9 +362,10 @@ import com.twine.tango.dal.TangoDB; * * @param tensileStrength the TensileStrength */ - public void setTensileStrength(Double tensileStrength) + public void setTensileStrength(double tensileStrength) { this.tensileStrength = tensileStrength; + notifyPropertyChanged(BR.tensileStrength); } @@ -350,7 +374,8 @@ import com.twine.tango.dal.TangoDB; * * return the ElongationAtBreakPercentage */ - public Double getElongationAtBreakPercentage() + @Bindable + public double getElongationAtBreakPercentage() { return elongationAtBreakPercentage; } @@ -360,9 +385,10 @@ import com.twine.tango.dal.TangoDB; * * @param elongationAtBreakPercentage the ElongationAtBreakPercentage */ - public void setElongationAtBreakPercentage(Double elongationAtBreakPercentage) + public void setElongationAtBreakPercentage(double elongationAtBreakPercentage) { this.elongationAtBreakPercentage = elongationAtBreakPercentage; + notifyPropertyChanged(BR.elongationAtBreakPercentage); } @@ -371,7 +397,8 @@ import com.twine.tango.dal.TangoDB; * * return the EstimatedThreadDiameter */ - public Double getEstimatedThreadDiameter() + @Bindable + public double getEstimatedThreadDiameter() { return estimatedThreadDiameter; } @@ -381,9 +408,10 @@ import com.twine.tango.dal.TangoDB; * * @param estimatedThreadDiameter the EstimatedThreadDiameter */ - public void setEstimatedThreadDiameter(Double estimatedThreadDiameter) + public void setEstimatedThreadDiameter(double estimatedThreadDiameter) { this.estimatedThreadDiameter = estimatedThreadDiameter; + notifyPropertyChanged(BR.estimatedThreadDiameter); } @@ -392,6 +420,7 @@ import com.twine.tango.dal.TangoDB; * * return the FiberShapes */ + @Bindable public FiberShape getFiberShapes() { return fiberShapes; @@ -405,6 +434,7 @@ import com.twine.tango.dal.TangoDB; public void setFiberShapes(FiberShape fiberShapes) { this.fiberShapes = fiberShapes; + notifyPropertyChanged(BR.fiberShapes); } @@ -413,6 +443,7 @@ import com.twine.tango.dal.TangoDB; * * return the FiberSynths */ + @Bindable public FiberSynth getFiberSynths() { return fiberSynths; @@ -426,6 +457,7 @@ import com.twine.tango.dal.TangoDB; public void setFiberSynths(FiberSynth fiberSynths) { this.fiberSynths = fiberSynths; + notifyPropertyChanged(BR.fiberSynths); } @@ -434,6 +466,7 @@ import com.twine.tango.dal.TangoDB; * * return the LinearMassDensityUnits */ + @Bindable public LinearMassDensityUnit getLinearMassDensityUnits() { return linearMassDensityUnits; @@ -447,6 +480,7 @@ import com.twine.tango.dal.TangoDB; public void setLinearMassDensityUnits(LinearMassDensityUnit linearMassDensityUnits) { this.linearMassDensityUnits = linearMassDensityUnits; + notifyPropertyChanged(BR.linearMassDensityUnits); } @@ -455,6 +489,7 @@ import com.twine.tango.dal.TangoDB; * * return the MediaColors */ + @Bindable public MediaColor getMediaColors() { return mediaColors; @@ -468,6 +503,7 @@ import com.twine.tango.dal.TangoDB; public void setMediaColors(MediaColor mediaColors) { this.mediaColors = mediaColors; + notifyPropertyChanged(BR.mediaColors); } @@ -476,6 +512,7 @@ import com.twine.tango.dal.TangoDB; * * return the MediaConditions */ + @Bindable public MediaCondition getMediaConditions() { return mediaConditions; @@ -489,6 +526,7 @@ import com.twine.tango.dal.TangoDB; public void setMediaConditions(MediaCondition mediaConditions) { this.mediaConditions = mediaConditions; + notifyPropertyChanged(BR.mediaConditions); } @@ -497,6 +535,7 @@ import com.twine.tango.dal.TangoDB; * * return the MediaMaterials */ + @Bindable public MediaMaterial getMediaMaterials() { return mediaMaterials; @@ -510,6 +549,7 @@ import com.twine.tango.dal.TangoDB; public void setMediaMaterials(MediaMaterial mediaMaterials) { this.mediaMaterials = mediaMaterials; + notifyPropertyChanged(BR.mediaMaterials); } @@ -518,6 +558,7 @@ import com.twine.tango.dal.TangoDB; * * return the MediaPurposes */ + @Bindable public MediaPurpose getMediaPurposes() { return mediaPurposes; @@ -531,6 +572,7 @@ import com.twine.tango.dal.TangoDB; public void setMediaPurposes(MediaPurpose mediaPurposes) { this.mediaPurposes = mediaPurposes; + notifyPropertyChanged(BR.mediaPurposes); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Role.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Role.java index 67af86526..89407ef95 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Role.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Role.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "ROLES", database = TangoDB.class) @@ -34,6 +36,7 @@ import com.twine.tango.dal.TangoDB; * * return the Code */ + @Bindable public int getCode() { return code; @@ -47,6 +50,7 @@ import com.twine.tango.dal.TangoDB; public void setCode(int code) { this.code = code; + notifyPropertyChanged(BR.code); } @@ -55,6 +59,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -68,6 +73,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } @@ -76,6 +82,7 @@ import com.twine.tango.dal.TangoDB; * * return the Description */ + @Bindable public String getDescription() { return description; @@ -89,6 +96,7 @@ import com.twine.tango.dal.TangoDB; public void setDescription(String description) { this.description = description; + notifyPropertyChanged(BR.description); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/RolesPermission.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/RolesPermission.java index 6fe88c192..3907d7fb5 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/RolesPermission.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/RolesPermission.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "ROLES_PERMISSIONS", database = TangoDB.class) @@ -29,6 +31,7 @@ import com.twine.tango.dal.TangoDB; * * return the Permission */ + @Bindable public Permission getPermission() { return permission; @@ -42,6 +45,7 @@ import com.twine.tango.dal.TangoDB; public void setPermission(Permission permission) { this.permission = permission; + notifyPropertyChanged(BR.permission); } @@ -50,6 +54,7 @@ import com.twine.tango.dal.TangoDB; * * return the Role */ + @Bindable public Role getRole() { return role; @@ -63,6 +68,7 @@ import com.twine.tango.dal.TangoDB; public void setRole(Role role) { this.role = role; + notifyPropertyChanged(BR.role); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Segment.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Segment.java index 516dbada9..c92e86485 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Segment.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Segment.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "SEGMENTS", database = TangoDB.class) @@ -19,7 +21,7 @@ import com.twine.tango.dal.TangoDB; @Column(name = "LENGTH") - private Double length; + private double length; @@ -39,6 +41,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -52,6 +55,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } @@ -60,7 +64,8 @@ import com.twine.tango.dal.TangoDB; * * return the Length */ - public Double getLength() + @Bindable + public double getLength() { return length; } @@ -70,9 +75,10 @@ import com.twine.tango.dal.TangoDB; * * @param length the Length */ - public void setLength(Double length) + public void setLength(double length) { this.length = length; + notifyPropertyChanged(BR.length); } @@ -81,6 +87,7 @@ import com.twine.tango.dal.TangoDB; * * return the SegmentIndex */ + @Bindable public int getSegmentIndex() { return segmentIndex; @@ -94,6 +101,7 @@ import com.twine.tango.dal.TangoDB; public void setSegmentIndex(int segmentIndex) { this.segmentIndex = segmentIndex; + notifyPropertyChanged(BR.segmentIndex); } @@ -102,6 +110,7 @@ import com.twine.tango.dal.TangoDB; * * return the Job */ + @Bindable public Job getJob() { return job; @@ -115,6 +124,7 @@ import com.twine.tango.dal.TangoDB; public void setJob(Job job) { this.job = job; + notifyPropertyChanged(BR.job); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SpoolType.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SpoolType.java index 983c25a25..3fcd0c7b4 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SpoolType.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SpoolType.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "SPOOL_TYPES", database = TangoDB.class) @@ -24,17 +26,17 @@ import com.twine.tango.dal.TangoDB; @Column(name = "LENGTH") - private Double length; + private double length; @Column(name = "WEIGHT") - private Double weight; + private double weight; @Column(name = "DIAMETER") - private Double diameter; + private double diameter; @@ -59,6 +61,7 @@ import com.twine.tango.dal.TangoDB; * * return the Code */ + @Bindable public int getCode() { return code; @@ -72,6 +75,7 @@ import com.twine.tango.dal.TangoDB; public void setCode(int code) { this.code = code; + notifyPropertyChanged(BR.code); } @@ -80,6 +84,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -93,6 +98,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } @@ -101,7 +107,8 @@ import com.twine.tango.dal.TangoDB; * * return the Length */ - public Double getLength() + @Bindable + public double getLength() { return length; } @@ -111,9 +118,10 @@ import com.twine.tango.dal.TangoDB; * * @param length the Length */ - public void setLength(Double length) + public void setLength(double length) { this.length = length; + notifyPropertyChanged(BR.length); } @@ -122,7 +130,8 @@ import com.twine.tango.dal.TangoDB; * * return the Weight */ - public Double getWeight() + @Bindable + public double getWeight() { return weight; } @@ -132,9 +141,10 @@ import com.twine.tango.dal.TangoDB; * * @param weight the Weight */ - public void setWeight(Double weight) + public void setWeight(double weight) { this.weight = weight; + notifyPropertyChanged(BR.weight); } @@ -143,7 +153,8 @@ import com.twine.tango.dal.TangoDB; * * return the Diameter */ - public Double getDiameter() + @Bindable + public double getDiameter() { return diameter; } @@ -153,9 +164,10 @@ import com.twine.tango.dal.TangoDB; * * @param diameter the Diameter */ - public void setDiameter(Double diameter) + public void setDiameter(double diameter) { this.diameter = diameter; + notifyPropertyChanged(BR.diameter); } @@ -164,6 +176,7 @@ import com.twine.tango.dal.TangoDB; * * return the StartOffsetPulses */ + @Bindable public int getStartOffsetPulses() { return startOffsetPulses; @@ -177,6 +190,7 @@ import com.twine.tango.dal.TangoDB; public void setStartOffsetPulses(int startOffsetPulses) { this.startOffsetPulses = startOffsetPulses; + notifyPropertyChanged(BR.startOffsetPulses); } @@ -185,6 +199,7 @@ import com.twine.tango.dal.TangoDB; * * return the BackingRate */ + @Bindable public int getBackingRate() { return backingRate; @@ -198,6 +213,7 @@ import com.twine.tango.dal.TangoDB; public void setBackingRate(int backingRate) { this.backingRate = backingRate; + notifyPropertyChanged(BR.backingRate); } @@ -206,6 +222,7 @@ import com.twine.tango.dal.TangoDB; * * return the SegmentOffsetPulses */ + @Bindable public int getSegmentOffsetPulses() { return segmentOffsetPulses; @@ -219,6 +236,7 @@ import com.twine.tango.dal.TangoDB; public void setSegmentOffsetPulses(int segmentOffsetPulses) { this.segmentOffsetPulses = segmentOffsetPulses; + notifyPropertyChanged(BR.segmentOffsetPulses); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SyncConfiguration.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SyncConfiguration.java index e4f95db71..acfad4bb7 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SyncConfiguration.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SyncConfiguration.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "SYNC_CONFIGURATIONS", database = TangoDB.class) diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechController.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechController.java index 5fcc18b52..104d5320d 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechController.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechController.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "TECH_CONTROLLERS", database = TangoDB.class) @@ -29,12 +31,12 @@ import com.twine.tango.dal.TangoDB; @Column(name = "MIN") - private Double min; + private double min; @Column(name = "MAX") - private Double max; + private double max; @@ -49,6 +51,7 @@ import com.twine.tango.dal.TangoDB; * * return the Code */ + @Bindable public int getCode() { return code; @@ -62,6 +65,7 @@ import com.twine.tango.dal.TangoDB; public void setCode(int code) { this.code = code; + notifyPropertyChanged(BR.code); } @@ -70,6 +74,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -83,6 +88,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } @@ -91,6 +97,7 @@ import com.twine.tango.dal.TangoDB; * * return the Description */ + @Bindable public String getDescription() { return description; @@ -104,6 +111,7 @@ import com.twine.tango.dal.TangoDB; public void setDescription(String description) { this.description = description; + notifyPropertyChanged(BR.description); } @@ -112,7 +120,8 @@ import com.twine.tango.dal.TangoDB; * * return the Min */ - public Double getMin() + @Bindable + public double getMin() { return min; } @@ -122,9 +131,10 @@ import com.twine.tango.dal.TangoDB; * * @param min the Min */ - public void setMin(Double min) + public void setMin(double min) { this.min = min; + notifyPropertyChanged(BR.min); } @@ -133,7 +143,8 @@ import com.twine.tango.dal.TangoDB; * * return the Max */ - public Double getMax() + @Bindable + public double getMax() { return max; } @@ -143,9 +154,10 @@ import com.twine.tango.dal.TangoDB; * * @param max the Max */ - public void setMax(Double max) + public void setMax(double max) { this.max = max; + notifyPropertyChanged(BR.max); } @@ -154,6 +166,7 @@ import com.twine.tango.dal.TangoDB; * * return the Units */ + @Bindable public String getUnits() { return units; @@ -167,6 +180,7 @@ import com.twine.tango.dal.TangoDB; public void setUnits(String units) { this.units = units; + notifyPropertyChanged(BR.units); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechDispenser.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechDispenser.java index 72f540afa..6034b6f6d 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechDispenser.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechDispenser.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "TECH_DISPENSERS", database = TangoDB.class) @@ -34,6 +36,7 @@ import com.twine.tango.dal.TangoDB; * * return the Code */ + @Bindable public int getCode() { return code; @@ -47,6 +50,7 @@ import com.twine.tango.dal.TangoDB; public void setCode(int code) { this.code = code; + notifyPropertyChanged(BR.code); } @@ -55,6 +59,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -68,6 +73,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } @@ -76,6 +82,7 @@ import com.twine.tango.dal.TangoDB; * * return the Description */ + @Bindable public String getDescription() { return description; @@ -89,6 +96,7 @@ import com.twine.tango.dal.TangoDB; public void setDescription(String description) { this.description = description; + notifyPropertyChanged(BR.description); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechIo.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechIo.java index a77e15a76..324130007 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechIo.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechIo.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "TECH_IOS", database = TangoDB.class) @@ -39,12 +41,12 @@ import com.twine.tango.dal.TangoDB; @Column(name = "MIN") - private Double min; + private double min; @Column(name = "MAX") - private Double max; + private double max; @@ -54,6 +56,7 @@ import com.twine.tango.dal.TangoDB; * * return the Code */ + @Bindable public int getCode() { return code; @@ -67,6 +70,7 @@ import com.twine.tango.dal.TangoDB; public void setCode(int code) { this.code = code; + notifyPropertyChanged(BR.code); } @@ -75,6 +79,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -88,6 +93,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } @@ -96,6 +102,7 @@ import com.twine.tango.dal.TangoDB; * * return the Description */ + @Bindable public String getDescription() { return description; @@ -109,6 +116,7 @@ import com.twine.tango.dal.TangoDB; public void setDescription(String description) { this.description = description; + notifyPropertyChanged(BR.description); } @@ -117,6 +125,7 @@ import com.twine.tango.dal.TangoDB; * * return the Port */ + @Bindable public int getPort() { return port; @@ -130,6 +139,7 @@ import com.twine.tango.dal.TangoDB; public void setPort(int port) { this.port = port; + notifyPropertyChanged(BR.port); } @@ -138,6 +148,7 @@ import com.twine.tango.dal.TangoDB; * * return the Type */ + @Bindable public int getType() { return type; @@ -151,6 +162,7 @@ import com.twine.tango.dal.TangoDB; public void setType(int type) { this.type = type; + notifyPropertyChanged(BR.type); } @@ -159,7 +171,8 @@ import com.twine.tango.dal.TangoDB; * * return the Min */ - public Double getMin() + @Bindable + public double getMin() { return min; } @@ -169,9 +182,10 @@ import com.twine.tango.dal.TangoDB; * * @param min the Min */ - public void setMin(Double min) + public void setMin(double min) { this.min = min; + notifyPropertyChanged(BR.min); } @@ -180,7 +194,8 @@ import com.twine.tango.dal.TangoDB; * * return the Max */ - public Double getMax() + @Bindable + public double getMax() { return max; } @@ -190,9 +205,10 @@ import com.twine.tango.dal.TangoDB; * * @param max the Max */ - public void setMax(Double max) + public void setMax(double max) { this.max = max; + notifyPropertyChanged(BR.max); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMonitor.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMonitor.java index 123adb157..7973037fb 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMonitor.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMonitor.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "TECH_MONITORS", database = TangoDB.class) @@ -29,12 +31,12 @@ import com.twine.tango.dal.TangoDB; @Column(name = "MIN") - private Double min; + private double min; @Column(name = "MAX") - private Double max; + private double max; @@ -49,7 +51,7 @@ import com.twine.tango.dal.TangoDB; @Column(name = "MULTI_CHANNEL") - private Boolean multiChannel; + private boolean multiChannel; @@ -64,6 +66,7 @@ import com.twine.tango.dal.TangoDB; * * return the Code */ + @Bindable public int getCode() { return code; @@ -77,6 +80,7 @@ import com.twine.tango.dal.TangoDB; public void setCode(int code) { this.code = code; + notifyPropertyChanged(BR.code); } @@ -85,6 +89,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -98,6 +103,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } @@ -106,6 +112,7 @@ import com.twine.tango.dal.TangoDB; * * return the Description */ + @Bindable public String getDescription() { return description; @@ -119,6 +126,7 @@ import com.twine.tango.dal.TangoDB; public void setDescription(String description) { this.description = description; + notifyPropertyChanged(BR.description); } @@ -127,7 +135,8 @@ import com.twine.tango.dal.TangoDB; * * return the Min */ - public Double getMin() + @Bindable + public double getMin() { return min; } @@ -137,9 +146,10 @@ import com.twine.tango.dal.TangoDB; * * @param min the Min */ - public void setMin(Double min) + public void setMin(double min) { this.min = min; + notifyPropertyChanged(BR.min); } @@ -148,7 +158,8 @@ import com.twine.tango.dal.TangoDB; * * return the Max */ - public Double getMax() + @Bindable + public double getMax() { return max; } @@ -158,9 +169,10 @@ import com.twine.tango.dal.TangoDB; * * @param max the Max */ - public void setMax(Double max) + public void setMax(double max) { this.max = max; + notifyPropertyChanged(BR.max); } @@ -169,6 +181,7 @@ import com.twine.tango.dal.TangoDB; * * return the Units */ + @Bindable public String getUnits() { return units; @@ -182,6 +195,7 @@ import com.twine.tango.dal.TangoDB; public void setUnits(String units) { this.units = units; + notifyPropertyChanged(BR.units); } @@ -190,6 +204,7 @@ import com.twine.tango.dal.TangoDB; * * return the PointsPerFrame */ + @Bindable public int getPointsPerFrame() { return pointsPerFrame; @@ -203,6 +218,7 @@ import com.twine.tango.dal.TangoDB; public void setPointsPerFrame(int pointsPerFrame) { this.pointsPerFrame = pointsPerFrame; + notifyPropertyChanged(BR.pointsPerFrame); } @@ -211,7 +227,8 @@ import com.twine.tango.dal.TangoDB; * * return the MultiChannel */ - public Boolean isMultiChannel() + @Bindable + public boolean isMultiChannel() { return multiChannel; } @@ -221,9 +238,10 @@ import com.twine.tango.dal.TangoDB; * * @param multiChannel the MultiChannel */ - public void setMultiChannel(Boolean multiChannel) + public void setMultiChannel(boolean multiChannel) { this.multiChannel = multiChannel; + notifyPropertyChanged(BR.multiChannel); } @@ -232,6 +250,7 @@ import com.twine.tango.dal.TangoDB; * * return the ChannelCount */ + @Bindable public int getChannelCount() { return channelCount; @@ -245,6 +264,7 @@ import com.twine.tango.dal.TangoDB; public void setChannelCount(int channelCount) { this.channelCount = channelCount; + notifyPropertyChanged(BR.channelCount); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMotor.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMotor.java index 86da1ddfe..035f87a8e 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMotor.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMotor.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "TECH_MOTORS", database = TangoDB.class) @@ -29,7 +31,7 @@ import com.twine.tango.dal.TangoDB; @Column(name = "SUPPORTS_HOMING") - private Boolean supportsHoming; + private boolean supportsHoming; @@ -39,6 +41,7 @@ import com.twine.tango.dal.TangoDB; * * return the Code */ + @Bindable public int getCode() { return code; @@ -52,6 +55,7 @@ import com.twine.tango.dal.TangoDB; public void setCode(int code) { this.code = code; + notifyPropertyChanged(BR.code); } @@ -60,6 +64,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -73,6 +78,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } @@ -81,6 +87,7 @@ import com.twine.tango.dal.TangoDB; * * return the Description */ + @Bindable public String getDescription() { return description; @@ -94,6 +101,7 @@ import com.twine.tango.dal.TangoDB; public void setDescription(String description) { this.description = description; + notifyPropertyChanged(BR.description); } @@ -102,7 +110,8 @@ import com.twine.tango.dal.TangoDB; * * return the SupportsHoming */ - public Boolean isSupportsHoming() + @Bindable + public boolean isSupportsHoming() { return supportsHoming; } @@ -112,9 +121,10 @@ import com.twine.tango.dal.TangoDB; * * @param supportsHoming the SupportsHoming */ - public void setSupportsHoming(Boolean supportsHoming) + public void setSupportsHoming(boolean supportsHoming) { this.supportsHoming = supportsHoming; + notifyPropertyChanged(BR.supportsHoming); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechValf.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechValf.java index c069ec3d2..4f9e9db43 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechValf.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechValf.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "TECH_VALVES", database = TangoDB.class) @@ -34,6 +36,7 @@ import com.twine.tango.dal.TangoDB; * * return the Code */ + @Bindable public int getCode() { return code; @@ -47,6 +50,7 @@ import com.twine.tango.dal.TangoDB; public void setCode(int code) { this.code = code; + notifyPropertyChanged(BR.code); } @@ -55,6 +59,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -68,6 +73,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } @@ -76,6 +82,7 @@ import com.twine.tango.dal.TangoDB; * * return the Description */ + @Bindable public String getDescription() { return description; @@ -89,6 +96,7 @@ import com.twine.tango.dal.TangoDB; public void setDescription(String description) { this.description = description; + notifyPropertyChanged(BR.description); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/User.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/User.java index 8694bfefc..befefe2be 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/User.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/User.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "USERS", database = TangoDB.class) @@ -14,7 +16,7 @@ import com.twine.tango.dal.TangoDB; { @Column(name = "DELETED") - private Boolean deleted; + private boolean deleted; @@ -49,7 +51,8 @@ import com.twine.tango.dal.TangoDB; * * return the Deleted */ - public Boolean isDeleted() + @Bindable + public boolean isDeleted() { return deleted; } @@ -59,9 +62,10 @@ import com.twine.tango.dal.TangoDB; * * @param deleted the Deleted */ - public void setDeleted(Boolean deleted) + public void setDeleted(boolean deleted) { this.deleted = deleted; + notifyPropertyChanged(BR.deleted); } @@ -70,6 +74,7 @@ import com.twine.tango.dal.TangoDB; * * return the Email */ + @Bindable public String getEmail() { return email; @@ -83,6 +88,7 @@ import com.twine.tango.dal.TangoDB; public void setEmail(String email) { this.email = email; + notifyPropertyChanged(BR.email); } @@ -91,6 +97,7 @@ import com.twine.tango.dal.TangoDB; * * return the Password */ + @Bindable public String getPassword() { return password; @@ -104,6 +111,7 @@ import com.twine.tango.dal.TangoDB; public void setPassword(String password) { this.password = password; + notifyPropertyChanged(BR.password); } @@ -112,6 +120,7 @@ import com.twine.tango.dal.TangoDB; * * return the Address */ + @Bindable public Address getAddress() { return address; @@ -125,6 +134,7 @@ import com.twine.tango.dal.TangoDB; public void setAddress(Address address) { this.address = address; + notifyPropertyChanged(BR.address); } @@ -133,6 +143,7 @@ import com.twine.tango.dal.TangoDB; * * return the Contact */ + @Bindable public Contact getContact() { return contact; @@ -146,6 +157,7 @@ import com.twine.tango.dal.TangoDB; public void setContact(Contact contact) { this.contact = contact; + notifyPropertyChanged(BR.contact); } @@ -154,6 +166,7 @@ import com.twine.tango.dal.TangoDB; * * return the Organization */ + @Bindable public Organization getOrganization() { return organization; @@ -167,6 +180,7 @@ import com.twine.tango.dal.TangoDB; public void setOrganization(Organization organization) { this.organization = organization; + notifyPropertyChanged(BR.organization); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/UsersRole.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/UsersRole.java index c40c669f2..79b78e788 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/UsersRole.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/UsersRole.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "USERS_ROLES", database = TangoDB.class) @@ -14,7 +16,7 @@ import com.twine.tango.dal.TangoDB; { @Column(name = "DELETED") - private Boolean deleted; + private boolean deleted; @@ -34,7 +36,8 @@ import com.twine.tango.dal.TangoDB; * * return the Deleted */ - public Boolean isDeleted() + @Bindable + public boolean isDeleted() { return deleted; } @@ -44,9 +47,10 @@ import com.twine.tango.dal.TangoDB; * * @param deleted the Deleted */ - public void setDeleted(Boolean deleted) + public void setDeleted(boolean deleted) { this.deleted = deleted; + notifyPropertyChanged(BR.deleted); } @@ -55,6 +59,7 @@ import com.twine.tango.dal.TangoDB; * * return the Role */ + @Bindable public Role getRole() { return role; @@ -68,6 +73,7 @@ import com.twine.tango.dal.TangoDB; public void setRole(Role role) { this.role = role; + notifyPropertyChanged(BR.role); } @@ -76,6 +82,7 @@ import com.twine.tango.dal.TangoDB; * * return the User */ + @Bindable public User getUser() { return user; @@ -89,6 +96,7 @@ import com.twine.tango.dal.TangoDB; public void setUser(User user) { this.user = user; + notifyPropertyChanged(BR.user); } } diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/WindingMethod.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/WindingMethod.java index 2ac62902f..21fab2480 100644 --- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/WindingMethod.java +++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/WindingMethod.java @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @Table(name = "WINDING_METHODS", database = TangoDB.class) @@ -34,6 +36,7 @@ import com.twine.tango.dal.TangoDB; * * return the Code */ + @Bindable public int getCode() { return code; @@ -47,6 +50,7 @@ import com.twine.tango.dal.TangoDB; public void setCode(int code) { this.code = code; + notifyPropertyChanged(BR.code); } @@ -55,6 +59,7 @@ import com.twine.tango.dal.TangoDB; * * return the Name */ + @Bindable public String getName() { return name; @@ -68,6 +73,7 @@ import com.twine.tango.dal.TangoDB; public void setName(String name) { this.name = name; + notifyPropertyChanged(BR.name); } @@ -76,6 +82,7 @@ import com.twine.tango.dal.TangoDB; * * return the Description */ + @Bindable public String getDescription() { return description; @@ -89,6 +96,7 @@ import com.twine.tango.dal.TangoDB; public void setDescription(String description) { this.description = description; + notifyPropertyChanged(BR.description); } } diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf Binary files differindex 8542aaac6..70461b5e5 100644 --- a/Software/DB/Tango.mdf +++ b/Software/DB/Tango.mdf diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf Binary files differindex bf5478dd0..35c2fd277 100644 --- a/Software/DB/Tango_log.ldf +++ b/Software/DB/Tango_log.ldf diff --git a/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFileJava.cshtml b/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFileJava.cshtml index aeba15b12..87c82395b 100644 --- a/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFileJava.cshtml +++ b/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFileJava.cshtml @@ -7,6 +7,8 @@ import com.raizlabs.android.dbflow.annotation.Table; import org.joda.time.DateTime; import com.twine.tango.dal.Entity; import com.twine.tango.dal.TangoDB; +import android.databinding.Bindable; +import com.twine.tango.dal.BR; @@Table(name = "@(Model.TableName)", database = TangoDB.class) @@ -40,7 +42,8 @@ import com.twine.tango.dal.TangoDB; * * return the @(prop.Name) */ - public @(prop.Type) @(prop.Type == "Boolean" ? "is" + prop.Name : "get" + prop.Name)() + @@Bindable + public @(prop.Type) @(prop.Type == "boolean" ? "is" + prop.Name : "get" + prop.Name)() { return @(prop.Description); } @@ -53,6 +56,7 @@ import com.twine.tango.dal.TangoDB; public void set@(prop.Name)(@(prop.Type) @(prop.Description)) { this.@(prop.Description) = @(prop.Description); + notifyPropertyChanged(BR.@(prop.Description)); } </div> } diff --git a/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/ObservablesGenerator.cs b/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/ObservablesGenerator.cs index 70664508c..ba950f3db 100644 --- a/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/ObservablesGenerator.cs +++ b/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/ObservablesGenerator.cs @@ -228,7 +228,7 @@ namespace Tango.DBObservablesGenerator.CLI codeField.Type = DalNameToStandardName(field.PropertyType.Name).Singularize(false); codeField.Construct = true; } - else if (field.PropertyType == typeof(Byte[])) + else if (field.PropertyType == typeof(Byte[]) || field.PropertyType == typeof(Boolean) || field.PropertyType == typeof(Double)) { codeField.Type = field.PropertyType.Name.ToLower(); } |