From 1ea9a40fd95417e4bfaf8ecb37294df6ecdf2002 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sat, 21 Jun 2014 15:15:07 +0000
Subject: [PATCH] update fromString for new onelab protocol
---
.../mobile/Android/src/org/geuz/onelab/Parameter.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/contrib/mobile/Android/src/org/geuz/onelab/Parameter.java b/contrib/mobile/Android/src/org/geuz/onelab/Parameter.java
index 98c614c4be..ebe59cc058 100644
--- a/contrib/mobile/Android/src/org/geuz/onelab/Parameter.java
+++ b/contrib/mobile/Android/src/org/geuz/onelab/Parameter.java
@@ -30,7 +30,7 @@ public class Parameter {
_readOnly = readOnly;
_changed = false;
}
-
+
protected void update(){
if(_label != null && !_label.equals(""))
_title.setText(_label);
@@ -38,7 +38,7 @@ public class Parameter {
_title.setText(getShortName());
if(isReadOnly()) _title.setAlpha(0.423f);
}
-
+
public void setName(String name) {_name = name;this.update();}
public void setReadOnly(boolean readOnly) {_readOnly = readOnly;this.update();}
public void setLabel(String label) {
@@ -65,19 +65,18 @@ public class Parameter {
setLabel(infos[pos++]);// label
pos++;// help
pos++;// never change
- pos++;// changed
if(Integer.parseInt(infos[pos++]) != 1)return -1;// visible
this.setReadOnly((infos[pos++].equals("1")));// read only
int nAttributes = Integer.parseInt(infos[pos++]);// number of attributes
pos+=(nAttributes*2);// key+value
int nClients = Integer.parseInt(infos[pos++]);// number of client
- pos+=nClients;// clients
+ pos+=(nClients*2);// client+changed
this.update();
return pos;
}
public boolean changed() { if(_changed){_changed=false; return true;}return _changed;}
public String getType(){return "Parameter";}
-
+
public LinearLayout getView() {
LinearLayout paramLayout = new LinearLayout(_context);
paramLayout.setOrientation(LinearLayout.VERTICAL);
--
GitLab