Menu
▾
▴
[Jsbml-svn] SF.net SVN: jsbml:[2235] trunk/extensions/spatial/src/org/sbml/jsbml/ext/ spatial
|
From: <pd...@us...> - 2015-04-23 12:52:44
|
Revision: 2235
http://sourceforge.net/p/jsbml/code/2235
Author: pdp10
Date: 2015-04-23 12:52:36 +0000 (Thu, 23 Apr 2015)
Log Message:
-----------
update spatial package to v0.90 - added arrayData to SpatialPoints.
Modified Paths:
--------------
trunk/extensions/spatial/src/org/sbml/jsbml/ext/spatial/ParametricObject.java
trunk/extensions/spatial/src/org/sbml/jsbml/ext/spatial/SpatialConstants.java
trunk/extensions/spatial/src/org/sbml/jsbml/ext/spatial/SpatialPoints.java
Modified: trunk/extensions/spatial/src/org/sbml/jsbml/ext/spatial/ParametricObject.java
===================================================================
--- trunk/extensions/spatial/src/org/sbml/jsbml/ext/spatial/ParametricObject.java 2015-04-23 12:13:02 UTC (rev 2234)
+++ trunk/extensions/spatial/src/org/sbml/jsbml/ext/spatial/ParametricObject.java 2015-04-23 12:52:36 UTC (rev 2235)
@@ -514,21 +514,21 @@
try {
setCompression(value);
} catch (Exception e) {
- MessageFormat.format(SpatialConstants.bundle.getString("COULD_NOT_READ"), value, SpatialConstants.polygonType);
+ MessageFormat.format(SpatialConstants.bundle.getString("COULD_NOT_READ"), value, SpatialConstants.compression);
}
}
else if (attributeName.equals(SpatialConstants.pointIndexLength)) {
try {
setPointIndexLength(StringTools.parseSBMLInt(value));
} catch (Exception e) {
- MessageFormat.format(SpatialConstants.bundle.getString("COULD_NOT_READ"), value, SpatialConstants.polygonType);
+ MessageFormat.format(SpatialConstants.bundle.getString("COULD_NOT_READ"), value, SpatialConstants.pointIndexLength);
}
}
else if (attributeName.equals(SpatialConstants.dataType)) {
try {
setDataType(value);
} catch (Exception e) {
- MessageFormat.format(SpatialConstants.bundle.getString("COULD_NOT_READ"), value, SpatialConstants.polygonType);
+ MessageFormat.format(SpatialConstants.bundle.getString("COULD_NOT_READ"), value, SpatialConstants.dataType);
}
}
else {
Modified: trunk/extensions/spatial/src/org/sbml/jsbml/ext/spatial/SpatialConstants.java
===================================================================
--- trunk/extensions/spatial/src/org/sbml/jsbml/ext/spatial/SpatialConstants.java 2015-04-23 12:13:02 UTC (rev 2234)
+++ trunk/extensions/spatial/src/org/sbml/jsbml/ext/spatial/SpatialConstants.java 2015-04-23 12:52:36 UTC (rev 2235)
@@ -515,6 +515,11 @@
/**
*
*/
+ public static final String arrayData = "arrayData";
+
+ /**
+ *
+ */
public static final String arrayDataLength = "arrayDataLength";
/**
Modified: trunk/extensions/spatial/src/org/sbml/jsbml/ext/spatial/SpatialPoints.java
===================================================================
--- trunk/extensions/spatial/src/org/sbml/jsbml/ext/spatial/SpatialPoints.java 2015-04-23 12:13:02 UTC (rev 2234)
+++ trunk/extensions/spatial/src/org/sbml/jsbml/ext/spatial/SpatialPoints.java 2015-04-23 12:52:36 UTC (rev 2235)
@@ -54,7 +54,10 @@
*
*/
private DataKind dataType;
-
+ /**
+ *
+ */
+ private String arrayData;
@@ -91,6 +94,9 @@
if (sp.isSetDataType()) {
setDataType(sp.getDataType());
}
+ if (sp.isSetArrayData()) {
+ setArrayData(sp.getArrayData());
+ }
}
@@ -111,6 +117,10 @@
if (equal && isSetCompression()) {
equal &= sp.getCompression().equals(getCompression());
}
+ equal &= sp.isSetArrayData() == isSetArrayData();
+ if (equal && isSetArrayData()) {
+ equal &= sp.getArrayData() == getArrayData();
+ }
equal &= sp.isSetArrayDataLength() == isSetArrayDataLength();
if (equal && isSetArrayDataLength()) {
equal &= sp.getArrayDataLength() == getArrayDataLength();
@@ -192,6 +202,78 @@
/**
+ * Returns the value of {@link #arrayData}.
+ *
+ * @return the value of {@link #arrayData}.
+ */
+ public String getArrayData() {
+ if (isSetArrayData()) {
+ return arrayData;
+ }
+ // This is necessary if we cannot return null here. For variables of type String return an empty String if no value is defined.
+ throw new PropertyUndefinedError(SpatialConstants.arrayData, this);
+ }
+
+
+ /**
+ * Returns whether {@link #arrayData} is set.
+ *
+ * @return whether {@link #arrayData} is set.
+ */
+ public boolean isSetArrayData() {
+ return this.arrayData != null;
+ }
+
+
+ /**
+ * Sets the value of arrayData
+ *
+ * @param arrayData the value of arrayData to be set.
+ */
+ public void setArrayData(String arrayData) {
+ String oldArrayData = this.arrayData;
+ this.arrayData = arrayData;
+ arrayDataLength = 1;
+ firePropertyChange(SpatialConstants.arrayData, oldArrayData, this.arrayData);
+ }
+
+
+ /**
+ * Unsets the variable arrayData.
+ *
+ * @return {@code true} if arrayData was set before, otherwise {@code false}.
+ */
+ public boolean unsetArrayData() {
+ if (isSetArrayData()) {
+ String oldArrayData = this.arrayData;
+ this.arrayData = null;
+ arrayDataLength = null;
+ firePropertyChange(SpatialConstants.arrayData, oldArrayData, this.arrayData);
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Appends the variable data to arrayData.
+ * @return {@code true} if data was appended to arrayData, otherwise {@code false}.
+ */
+ public boolean append(String data) {
+ if (isSetArrayData()) {
+ String oldArrayData = this.arrayData;
+ if(compression == CompressionKind.UNCOMPRESSED) {
+ this.arrayData = this.arrayData + "; " + data;
+ } else { // data is compressed
+ this.arrayData = this.arrayData + " " + data;
+ }
+ arrayDataLength++;
+ firePropertyChange(SpatialConstants.arrayData, oldArrayData, this.arrayData);
+ return true;
+ }
+ return false;
+ }
+
+ /**
* Returns the value of arrayDataLength.
*
* @return the value of arrayDataLength.
@@ -313,6 +395,9 @@
if (isSetArrayDataLength()) {
hashCode += prime * getArrayDataLength();
}
+ if (isSetArrayData()) {
+ hashCode += prime * getArrayData().hashCode();
+ }
if (isSetDataType()) {
hashCode += prime * getDataType().hashCode();
}
@@ -332,6 +417,11 @@
attributes.put(SpatialConstants.shortLabel + ":arrayDataLength",
String.valueOf(getArrayDataLength()));
}
+ if (isSetArrayData()) {
+ attributes.remove("arrayData");
+ attributes.put(SpatialConstants.shortLabel + ":arrayData",
+ getArrayData());
+ }
if (isSetDataType()) {
attributes.remove("dataType");
attributes.put(SpatialConstants.shortLabel + ":dataType",
@@ -350,21 +440,28 @@
try {
setCompression(value);
} catch (Exception e) {
- MessageFormat.format(SpatialConstants.bundle.getString("COULD_NOT_READ"), value, SpatialConstants.polygonType);
+ MessageFormat.format(SpatialConstants.bundle.getString("COULD_NOT_READ"), value, SpatialConstants.compression);
}
}
else if (attributeName.equals(SpatialConstants.arrayDataLength)) {
try {
setArrayDataLength(StringTools.parseSBMLInt(value));
} catch (Exception e) {
- MessageFormat.format(SpatialConstants.bundle.getString("COULD_NOT_READ"), value, SpatialConstants.polygonType);
+ MessageFormat.format(SpatialConstants.bundle.getString("COULD_NOT_READ"), value, SpatialConstants.arrayDataLength);
}
}
+ else if (attributeName.equals(SpatialConstants.arrayData)) {
+ try {
+ setArrayData(value);
+ } catch (Exception e) {
+ MessageFormat.format(SpatialConstants.bundle.getString("COULD_NOT_READ"), value, SpatialConstants.arrayData);
+ }
+ }
else if (attributeName.equals(SpatialConstants.dataType)) {
try {
setDataType(value);
} catch (Exception e) {
- MessageFormat.format(SpatialConstants.bundle.getString("COULD_NOT_READ"), value, SpatialConstants.polygonType);
+ MessageFormat.format(SpatialConstants.bundle.getString("COULD_NOT_READ"), value, SpatialConstants.dataType);
}
}
else {
@@ -382,6 +479,8 @@
StringBuilder builder = new StringBuilder();
builder.append("ParametricObject [compression=");
builder.append(compression);
+ builder.append(", arrayData=");
+ builder.append(arrayData);
builder.append(", arrayDataLength=");
builder.append(arrayDataLength);
builder.append(", dataType=");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
