[Tinyos-2-commits] CVS: tinyos-2.x/support/sdk/java/net/tinyos/mviz
DDocument.java, 1.1.2.10, 1.1.2.11 DLayer.java, 1.1.2.9,
1.1.2.10 DLinkModel.java, 1.1.2.4, 1.1.2.5 DMoteModel.java,
1.1.2.6, 1.1.2.7 DNavigate.java, 1.1.2.10,
1.1.2.11 DShapeModel.java, 1.1.2.1, 1.1.2.2 DataModel.java,
1.1.2.2, 1.1.2.3 MessageInput.java, 1.1.2.4, 1.1.2.5
Phil Levis
scipio at users.sourceforge.net
Sun Nov 5 11:45:59 PST 2006
Update of /cvsroot/tinyos/tinyos-2.x/support/sdk/java/net/tinyos/mviz
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21012/net/tinyos/mviz
Modified Files:
Tag: tinyos-2_0_devel-BRANCH
DDocument.java DLayer.java DLinkModel.java DMoteModel.java
DNavigate.java DShapeModel.java DataModel.java
MessageInput.java
Log Message:
MViz no longer requires Java 1.5.
Index: DDocument.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/sdk/java/net/tinyos/mviz/Attic/DDocument.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -C2 -d -r1.1.2.10 -r1.1.2.11
*** DDocument.java 30 Oct 2006 00:40:42 -0000 1.1.2.10
--- DDocument.java 5 Nov 2006 19:45:56 -0000 1.1.2.11
***************
*** 55,59 ****
protected String directory;
protected JPanel canvas;
! protected Vector<DLayer> layers;
private Color currentColor;
--- 55,59 ----
protected String directory;
protected JPanel canvas;
! protected Vector layers;
private Color currentColor;
***************
*** 68,73 ****
public DNavigate navigator;
public Color getColor(){ return currentColor; }
! public Vector<String> sensed_motes;
! public Vector<String> sensed_links;
public ArrayList moteModels;
public ArrayList linkModels;
--- 68,73 ----
public DNavigate navigator;
public Color getColor(){ return currentColor; }
! public Vector sensed_motes;
! public Vector sensed_links;
public ArrayList moteModels;
public ArrayList linkModels;
***************
*** 76,90 ****
private JTable jTable;
! private String[] toStringArray(Vector<String> v) {
String[] array = new String[v.size()];
for (int i = 0; i < v.size(); i++) {
! array[i] = v.elementAt(i);
}
return array;
}
! public DDocument(int width, int height, Vector<String> fieldVector, Vector<String> linkVector, String dir) {
super();
! layers = new Vector<DLayer>();
directory = dir;
--- 76,90 ----
private JTable jTable;
! private String[] toStringArray(Vector v) {
String[] array = new String[v.size()];
for (int i = 0; i < v.size(); i++) {
! array[i] = (String)v.elementAt(i);
}
return array;
}
! public DDocument(int width, int height, Vector fieldVector, Vector linkVector, String dir) {
super();
! layers = new Vector();
directory = dir;
***************
*** 107,122 ****
sensed_motes = fieldVector;
sensed_links = linkVector;
! moteIndex = new HashMap<Integer, DMoteModel>();
! linkIndex = new HashMap<String, DLinkModel>();
- //String name = directory + "/images/tmote_sky.gif";
String imgName = directory + "/mote.gif";
- //System.out.println(name);
- //URL imgURL = getClass().getResource(name);
- //icon = new ImageIcon(directory + "/images/tmote_sky.jpg", "mote");
try {
- //System.out.println(name + " " + imgURL);
image = Toolkit.getDefaultToolkit().getImage(imgName);
- //System.out.println(image);
}
catch (Exception e) {
--- 107,116 ----
sensed_motes = fieldVector;
sensed_links = linkVector;
! moteIndex = new HashMap();
! linkIndex = new HashMap();
String imgName = directory + "/mote.gif";
try {
image = Toolkit.getDefaultToolkit().getImage(imgName);
}
catch (Exception e) {
***************
*** 170,182 ****
public int height_canvas = 600;
! protected ArrayList<DMoteModel> motes = new ArrayList<DMoteModel>();
! protected ArrayList<DLinkModel> links = new ArrayList<DLinkModel>();
protected DMoteModel selected = null;
! protected HashMap<Integer, DMoteModel> moteIndex;
! protected HashMap<String, DLinkModel> linkIndex;
// Provided default ctor that calls the regular ctor
! public DDocument(Vector<String> fieldVector, Vector<String> linkVector) {
this(300, 300, fieldVector, linkVector, "."); // this syntax calls one ctor from another
}
--- 164,176 ----
public int height_canvas = 600;
! protected ArrayList motes = new ArrayList();
! protected ArrayList links = new ArrayList();
protected DMoteModel selected = null;
! protected HashMap moteIndex;
! protected HashMap linkIndex;
// Provided default ctor that calls the regular ctor
! public DDocument(Vector fieldVector, Vector linkVector) {
this(300, 300, fieldVector, linkVector, "."); // this syntax calls one ctor from another
}
***************
*** 230,234 ****
int moteID = vsv.moteId();
int value = vsv.value();
! DMoteModel m = moteIndex.get(new Integer(moteID));
if (m == null) {
m = createNewMote(moteID);
--- 224,228 ----
int moteID = vsv.moteId();
int value = vsv.value();
! DMoteModel m = (DMoteModel)moteIndex.get(new Integer(moteID));
if (m == null) {
m = createNewMote(moteID);
***************
*** 244,256 ****
int endMote = lsv.end();
int value = lsv.value();
! DMoteModel m = moteIndex.get(new Integer(startMote));
if (m == null) {
m = createNewMote(startMote);
}
! DMoteModel m2 = moteIndex.get(new Integer(endMote));
if (m2 == null) {
m2 = createNewMote(endMote);
}
! DLinkModel dl = linkIndex.get(startMote + " " + endMote);
if (dl == null) {
//System.out.println("Does not contain key <" + startMote + " " + endMote + ">");
--- 238,250 ----
int endMote = lsv.end();
int value = lsv.value();
! DMoteModel m = (DMoteModel)moteIndex.get(new Integer(startMote));
if (m == null) {
m = createNewMote(startMote);
}
! DMoteModel m2 = (DMoteModel)moteIndex.get(new Integer(endMote));
if (m2 == null) {
m2 = createNewMote(endMote);
}
! DLinkModel dl = (DLinkModel)linkIndex.get(startMote + " " + endMote);
if (dl == null) {
//System.out.println("Does not contain key <" + startMote + " " + endMote + ">");
***************
*** 273,277 ****
public static void main(String[] args) {
JFrame frame = new JFrame("MViz");
! Vector<String> packetVector = new Vector<String>();
String source = null;
String dir = ".";
--- 267,271 ----
public static void main(String[] args) {
JFrame frame = new JFrame("MViz");
! Vector packetVector = new Vector();
String source = null;
String dir = ".";
***************
*** 330,336 ****
extends AbstractTableModel
implements DMoteModelListener {
! private Vector<String> fields;
! public DrawTableModel(Vector<String> fields) {
this.fields = fields;
}
--- 324,330 ----
extends AbstractTableModel
implements DMoteModelListener {
! private Vector fields;
! public DrawTableModel(Vector fields) {
this.fields = fields;
}
***************
*** 343,347 ****
return "Y";
default:
! return fields.elementAt(col - 2);
}
}
--- 337,341 ----
return "Y";
default:
! return (String)fields.elementAt(col - 2);
}
}
***************
*** 410,416 ****
lastX = e.getX();
lastY = e.getY();
! Iterator<DMoteModel> it = doc.motes.iterator();
while (it.hasNext()) {
! DMoteModel model = it.next();
if (withinRange(e.getX(),
model.getLocX() - 20,
--- 404,410 ----
lastX = e.getX();
lastY = e.getY();
! Iterator it = doc.motes.iterator();
while (it.hasNext()) {
! DMoteModel model = (DMoteModel)it.next();
if (withinRange(e.getX(),
model.getLocX() - 20,
Index: DLayer.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/sdk/java/net/tinyos/mviz/Attic/DLayer.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -C2 -d -r1.1.2.9 -r1.1.2.10
*** DLayer.java 30 Oct 2006 00:40:42 -0000 1.1.2.9
--- DLayer.java 5 Nov 2006 19:45:56 -0000 1.1.2.10
***************
*** 74,78 ****
protected int zIndex;
protected int z_index = 0;
! private ArrayList<DShape> layer = new ArrayList<DShape>();
private JLabel label;
--- 74,78 ----
protected int zIndex;
protected int z_index = 0;
! private ArrayList layer = new ArrayList();
private JLabel label;
***************
*** 340,347 ****
paintScreenBefore(g);
} else if (type == LINK) {
! Iterator<DLinkModel> it = models.iterator();
//System.out.print("Draw links: ");
while (it.hasNext()) {
! DLinkModel model = it.next();
DLink lnk = new DLink(model, parent, this);
lnk.paintShape(g);
--- 340,347 ----
paintScreenBefore(g);
} else if (type == LINK) {
! Iterator it = models.iterator();
//System.out.print("Draw links: ");
while (it.hasNext()) {
! DLinkModel model = (DLinkModel)it.next();
DLink lnk = new DLink(model, parent, this);
lnk.paintShape(g);
***************
*** 351,358 ****
}
else if (type == MOTE) {
! Iterator<DMoteModel> it = models.iterator();
//System.out.print("Draw motes: ");
while (it.hasNext()){
! DMoteModel model = it.next();
DShape m = new DMote(model, parent, this);
m.paintShape(g);
--- 351,358 ----
}
else if (type == MOTE) {
! Iterator it = models.iterator();
//System.out.print("Draw motes: ");
while (it.hasNext()){
! DMoteModel model = (DMoteModel)it.next();
DShape m = new DMote(model, parent, this);
m.paintShape(g);
Index: DLinkModel.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/sdk/java/net/tinyos/mviz/Attic/DLinkModel.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** DLinkModel.java 30 Oct 2006 00:40:42 -0000 1.1.2.4
--- DLinkModel.java 5 Nov 2006 19:45:56 -0000 1.1.2.5
***************
*** 56,60 ****
public DDocument root;
! transient private ArrayList<DLinkModelListener> listeners;
protected int x12, y12;
--- 56,60 ----
public DDocument root;
! transient private ArrayList listeners;
protected int x12, y12;
***************
*** 135,139 ****
public void addListener(DLinkModelListener listener) {
! if (listeners == null) listeners = new ArrayList<DLinkModelListener>();
Iterator it = listeners.iterator();
while (it.hasNext()) { if (it.next() == listener) return; };
--- 135,139 ----
public void addListener(DLinkModelListener listener) {
! if (listeners == null) listeners = new ArrayList();
Iterator it = listeners.iterator();
while (it.hasNext()) { if (it.next() == listener) return; };
Index: DMoteModel.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/sdk/java/net/tinyos/mviz/Attic/DMoteModel.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -d -r1.1.2.6 -r1.1.2.7
*** DMoteModel.java 30 Oct 2006 00:40:42 -0000 1.1.2.6
--- DMoteModel.java 5 Nov 2006 19:45:56 -0000 1.1.2.7
***************
*** 56,60 ****
public DDocument root;
! transient private ArrayList<DMoteModelListener> listeners;
protected int x, y, id;
--- 56,60 ----
public DDocument root;
! transient private ArrayList listeners;
protected int x, y, id;
***************
*** 187,191 ****
public void addListener(DMoteModelListener listener) {
! if (listeners == null) listeners = new ArrayList<DMoteModelListener>();
Iterator it = listeners.iterator();
while (it.hasNext()) { if (it.next() == listener) return; };
--- 187,191 ----
public void addListener(DMoteModelListener listener) {
! if (listeners == null) listeners = new ArrayList();
Iterator it = listeners.iterator();
while (it.hasNext()) { if (it.next() == listener) return; };
Index: DNavigate.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/sdk/java/net/tinyos/mviz/Attic/DNavigate.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -C2 -d -r1.1.2.10 -r1.1.2.11
*** DNavigate.java 31 Oct 2006 01:36:00 -0000 1.1.2.10
--- DNavigate.java 5 Nov 2006 19:45:56 -0000 1.1.2.11
***************
*** 56,60 ****
public class DNavigate extends JPanel implements ActionListener{
private DDocument parent;
! protected ArrayList<DLayer> layers = new ArrayList<DLayer>();
private int _tmp_i = 0;
protected int totalLayers = 0;
--- 56,60 ----
public class DNavigate extends JPanel implements ActionListener{
private DDocument parent;
! protected ArrayList layers = new ArrayList();
private int _tmp_i = 0;
protected int totalLayers = 0;
***************
*** 63,67 ****
private int default_height = 600;
! public DNavigate(Vector<String>label_motes, Vector<String> label_links, DDocument parent){
this.parent = parent;
BoxLayout layout = new BoxLayout(this,BoxLayout.PAGE_AXIS);
--- 63,67 ----
private int default_height = 600;
! public DNavigate(Vector label_motes, Vector label_links, DDocument parent){
this.parent = parent;
BoxLayout layout = new BoxLayout(this,BoxLayout.PAGE_AXIS);
***************
*** 79,85 ****
// debug prints
! Iterator<DLayer> it = layers.iterator();
while (it.hasNext()){
! DLayer m = it.next();
//System.out.println("setting layer: zIndex=" + m.z_index + ", index=" + m.zIndex);
}
--- 79,85 ----
// debug prints
! Iterator it = layers.iterator();
while (it.hasNext()){
! DLayer m = (DLayer)it.next();
//System.out.println("setting layer: zIndex=" + m.z_index + ", index=" + m.zIndex);
}
***************
*** 88,100 ****
protected void addMote(DMoteModel model){
! Iterator<DLayer> it = layers.iterator();
while(it.hasNext()){
! it.next().addMote(model, true);
}
}
! private void addLayer(Vector<String> labels, int type, ArrayList models){
for (int i=0; i<labels.size(); i++, _tmp_i++){
! DLayer d = new DLayer(_tmp_i, i, labels.elementAt(i), type, parent, models, this);
this.add(d);
layers.add(d);
--- 88,101 ----
protected void addMote(DMoteModel model){
! Iterator it = layers.iterator();
while(it.hasNext()){
! DLayer layer = (DLayer)it.next();
! layer.addMote(model, true);
}
}
! private void addLayer(Vector labels, int type, ArrayList models){
for (int i=0; i<labels.size(); i++, _tmp_i++){
! DLayer d = new DLayer(_tmp_i, i, (String)labels.elementAt(i), type, parent, models, this);
this.add(d);
layers.add(d);
***************
*** 104,112 ****
private void updateLayerIndex(boolean repaint){
int length = layers.size();
! Iterator<DLayer> it = layers.iterator();
int i = 0;
while (it.hasNext()){
! DLayer d = it.next();
! d.updateIndex(i, repaint);
++i;
}
--- 105,113 ----
private void updateLayerIndex(boolean repaint){
int length = layers.size();
! Iterator it = layers.iterator();
int i = 0;
while (it.hasNext()){
! DLayer d = (DLayer)it.next();
! d.updateIndex(i, repaint);
++i;
}
***************
*** 115,125 ****
public void redrawNavigator(){
//System.out.println("Redrawing navigator.");
! Iterator<DLayer> it = layers.iterator();
while (it.hasNext()){
! remove(it.next());
}
it = layers.iterator();
while (it.hasNext()){
! add(it.next());
}
--- 116,126 ----
public void redrawNavigator(){
//System.out.println("Redrawing navigator.");
! Iterator it = layers.iterator();
while (it.hasNext()){
! remove((DLayer)it.next());
}
it = layers.iterator();
while (it.hasNext()){
! add((DLayer)it.next());
}
***************
*** 150,156 ****
public void init(){
! Iterator<DLayer> it = layers.iterator();
while (it.hasNext()){
! (it.next()).init();
}
}
--- 151,158 ----
public void init(){
! Iterator it = layers.iterator();
while (it.hasNext()){
! DLayer layer = (DLayer)it.next();
! layer.init();
}
}
***************
*** 161,165 ****
//System.out.println("Painting navigator");
redrawNavigator();
! Iterator<DLayer> it = layers.iterator();
}
--- 163,167 ----
//System.out.println("Painting navigator");
redrawNavigator();
! Iterator it = layers.iterator();
}
***************
*** 184,188 ****
int start = totalLayers-1;
for (int i=0; i<totalLayers; i++){
! DLayer a = layers.get(i);
if (a.isFieldSelected()){
start = a.zIndex;
--- 186,190 ----
int start = totalLayers-1;
for (int i=0; i<totalLayers; i++){
! DLayer a = (DLayer)layers.get(i);
if (a.isFieldSelected()){
start = a.zIndex;
***************
*** 190,194 ****
}
}
! DLayer bg = layers.get(start);
Image offscreen = new BufferedImage(parent.canvas.getWidth(), parent.canvas.getHeight(), BufferedImage.TYPE_INT_ARGB);
Graphics g = offscreen.getGraphics();
--- 192,196 ----
}
}
! DLayer bg = (DLayer)layers.get(start);
Image offscreen = new BufferedImage(parent.canvas.getWidth(), parent.canvas.getHeight(), BufferedImage.TYPE_INT_ARGB);
Graphics g = offscreen.getGraphics();
***************
*** 198,202 ****
for (int i=start; i>=0; i--){
! DLayer a = layers.get(i);
a.repaintLayer(g);
}
--- 200,204 ----
for (int i=start; i>=0; i--){
! DLayer a = (DLayer)layers.get(i);
a.repaintLayer(g);
}
Index: DShapeModel.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/sdk/java/net/tinyos/mviz/Attic/DShapeModel.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** DShapeModel.java 24 Oct 2006 20:33:35 -0000 1.1.2.1
--- DShapeModel.java 5 Nov 2006 19:45:56 -0000 1.1.2.2
***************
*** 61,65 ****
// NOTE: "transient" -- not serialized
! transient private ArrayList<DShapeModelListener> listeners;
public DShapeModel(char type, int x, int y, float value) {
--- 61,65 ----
// NOTE: "transient" -- not serialized
! transient private ArrayList listeners;
public DShapeModel(char type, int x, int y, float value) {
***************
*** 159,163 ****
public void addListener(DShapeModelListener listener) {
! if (listeners == null) listeners = new ArrayList<DShapeModelListener>();
Iterator it = listeners.iterator();
while (it.hasNext()) {
--- 159,163 ----
public void addListener(DShapeModelListener listener) {
! if (listeners == null) listeners = new ArrayList();
Iterator it = listeners.iterator();
while (it.hasNext()) {
Index: DataModel.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/sdk/java/net/tinyos/mviz/Attic/DataModel.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** DataModel.java 29 Oct 2006 19:41:59 -0000 1.1.2.2
--- DataModel.java 5 Nov 2006 19:45:56 -0000 1.1.2.3
***************
*** 36,61 ****
public class DataModel {
! Vector<Class> packetClasses = new Vector<Class>();
! Vector<String> fields = new Vector<String>();
! Vector<String> links = new Vector<String>();
! public DataModel(Vector<String> messageNames) {
createPackets(messageNames);
parseFieldsAndLinks();
}
! public Vector<String> fields() {
return fields;
}
! public Vector<String> links() {
return links;
}
! private void createPackets(Vector<String> messageNames) {
for (int i = 0; i < messageNames.size(); i++) {
try {
System.out.println("Making " + messageNames.elementAt(i));
! Class c = Class.forName(messageNames.elementAt(i));
packetClasses.add(c);
}
--- 36,61 ----
public class DataModel {
! Vector packetClasses = new Vector();
! Vector fields = new Vector();
! Vector links = new Vector();
! public DataModel(Vector messageNames) {
createPackets(messageNames);
parseFieldsAndLinks();
}
! public Vector fields() {
return fields;
}
! public Vector links() {
return links;
}
! private void createPackets(Vector messageNames) {
for (int i = 0; i < messageNames.size(); i++) {
try {
System.out.println("Making " + messageNames.elementAt(i));
! Class c = Class.forName((String)messageNames.elementAt(i));
packetClasses.add(c);
}
***************
*** 80,84 ****
Class messageClass = msg.getClass();
for (int i = 0; i < packetClasses.size(); i++) {
! Class pkt = packetClasses.elementAt(i);
if (!(isSubClass(pkt, messageClass))) {
continue;
--- 80,84 ----
Class messageClass = msg.getClass();
for (int i = 0; i < packetClasses.size(); i++) {
! Class pkt = (Class)packetClasses.elementAt(i);
if (!(isSubClass(pkt, messageClass))) {
continue;
Index: MessageInput.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/sdk/java/net/tinyos/mviz/Attic/MessageInput.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** MessageInput.java 29 Oct 2006 19:41:59 -0000 1.1.2.4
--- MessageInput.java 5 Nov 2006 19:45:56 -0000 1.1.2.5
***************
*** 42,50 ****
public class MessageInput implements net.tinyos.message.MessageListener {
! private Vector<Message> msgVector = new Vector<Message>();
private MoteIF moteIF;
private DDocument document;
! public MessageInput(Vector<String> packetVector, String commSource, DDocument doc) {
document = doc;
loadMessages(packetVector);
--- 42,50 ----
public class MessageInput implements net.tinyos.message.MessageListener {
! private Vector msgVector = new Vector();
private MoteIF moteIF;
private DDocument document;
! public MessageInput(Vector packetVector, String commSource, DDocument doc) {
document = doc;
loadMessages(packetVector);
***************
*** 53,59 ****
}
! private void loadMessages(Vector<String> packetVector) {
for (int i = 0; i < packetVector.size(); i++) {
! String className = packetVector.elementAt(i);
try {
Class c = Class.forName(className);
--- 53,59 ----
}
! private void loadMessages(Vector packetVector) {
for (int i = 0; i < packetVector.size(); i++) {
! String className = (String)packetVector.elementAt(i);
try {
Class c = Class.forName(className);
***************
*** 92,97 ****
public void messageReceived(int to, Message message) {
! Hashtable<String,Integer> table = new Hashtable<String,Integer>();
! Hashtable<String,Integer> linkTable = new Hashtable<String,Integer>();
//System.out.println("Received message:");
//System.out.println(message);
--- 92,97 ----
public void messageReceived(int to, Message message) {
! Hashtable table = new Hashtable();
! Hashtable linkTable = new Hashtable();
//System.out.println("Received message:");
//System.out.println(message);
***************
*** 110,116 ****
name = name.substring(4); // Chop off "get_"
try {
- Object res = method.invoke(message);
//System.out.println(name + " returns " + res);
! Integer result = (Integer)method.invoke(message);
table.put(name, result);
}
--- 110,115 ----
name = name.substring(4); // Chop off "get_"
try {
//System.out.println(name + " returns " + res);
! Integer result = (Integer)method.invoke(message, null);
table.put(name, result);
}
***************
*** 125,131 ****
name = name.substring(9); // chop off "get_link_"
try {
! Object res = method.invoke(message);
! //System.out.println(name + " returns " + res);
! Integer result = (Integer)method.invoke(message);
linkTable.put(name, result);
}
--- 124,128 ----
name = name.substring(9); // chop off "get_link_"
try {
! Integer result = (Integer)method.invoke(message, null);
linkTable.put(name, result);
}
***************
*** 141,157 ****
Integer origin = (Integer)table.get("origin");
//table.remove("origin");
! Enumeration<String> elements = table.keys();
while (elements.hasMoreElements()) {
! String key = elements.nextElement();
! Integer value = table.get(key);
document.setMoteValue(origin.intValue(), key, value.intValue());
}
elements = linkTable.keys();
while (elements.hasMoreElements()) {
! String key = elements.nextElement();
if (!key.endsWith("_value")) {
continue;
}
! Integer value = linkTable.get(key);
key = key.substring(0, key.length() - 6); // chop off "_value"
String addrkey = key + "_addr";
--- 138,154 ----
Integer origin = (Integer)table.get("origin");
//table.remove("origin");
! Enumeration elements = table.keys();
while (elements.hasMoreElements()) {
! String key = (String)elements.nextElement();
! Integer value = (Integer)table.get(key);
document.setMoteValue(origin.intValue(), key, value.intValue());
}
elements = linkTable.keys();
while (elements.hasMoreElements()) {
! String key = (String)elements.nextElement();
if (!key.endsWith("_value")) {
continue;
}
! Integer value = (Integer)linkTable.get(key);
key = key.substring(0, key.length() - 6); // chop off "_value"
String addrkey = key + "_addr";
***************
*** 159,163 ****
continue;
}
! Integer addr = linkTable.get(addrkey);
document.setLinkValue(origin.intValue(), addr.intValue(), key, value.intValue());
}
--- 156,160 ----
continue;
}
! Integer addr = (Integer)linkTable.get(addrkey);
document.setLinkValue(origin.intValue(), addr.intValue(), key, value.intValue());
}
More information about the Tinyos-2-commits
mailing list