Menu
▾
▴
[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2065] trunk/org.rubypeople.rdt.debug.core/src/org /rubypeople/rdt/internal/debug/core
|
From: <caw...@us...> - 2007-02-28 14:43:53
|
Revision: 2065
http://svn.sourceforge.net/rubyeclipse/?rev=2065&view=rev
Author: cawilliams
Date: 2007-02-28 06:18:45 -0800 (Wed, 28 Feb 2007)
Log Message:
-----------
clean up type safety warnings, make ThreadInfo immutable value object
Modified Paths:
--------------
trunk/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/model/ThreadInfo.java
trunk/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/parsing/FramesReader.java
trunk/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/parsing/ThreadInfoReader.java
Modified: trunk/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/model/ThreadInfo.java
===================================================================
--- trunk/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/model/ThreadInfo.java 2007-02-28 14:14:21 UTC (rev 2064)
+++ trunk/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/model/ThreadInfo.java 2007-02-28 14:18:45 UTC (rev 2065)
@@ -1,8 +1,14 @@
package org.rubypeople.rdt.internal.debug.core.model;
public class ThreadInfo {
- private int id ;
- private String status ;
+ private int id;
+ private String status;
+
+ public ThreadInfo(int id, String status) {
+ this.id = id;
+ this.status = status;
+ }
+
public int getId() {
return id;
}
@@ -10,13 +16,4 @@
public String getStatus() {
return status;
}
-
- public void setId(int id) {
- this.id = id;
- }
-
- public void setStatus(String status) {
- this.status = status;
- }
-
}
Modified: trunk/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/parsing/FramesReader.java
===================================================================
--- trunk/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/parsing/FramesReader.java 2007-02-28 14:14:21 UTC (rev 2064)
+++ trunk/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/parsing/FramesReader.java 2007-02-28 14:18:45 UTC (rev 2065)
@@ -1,7 +1,9 @@
package org.rubypeople.rdt.internal.debug.core.parsing;
import java.util.ArrayList;
+import java.util.List;
+import org.eclipse.debug.core.model.IStackFrame;
import org.rubypeople.rdt.internal.debug.core.RdtDebugCorePlugin;
import org.rubypeople.rdt.internal.debug.core.model.RubyStackFrame;
import org.rubypeople.rdt.internal.debug.core.model.RubyThread;
@@ -11,8 +13,8 @@
public class FramesReader extends XmlStreamReader {
private RubyThread thread;
- int index = 1 ;
- private ArrayList frames ;
+ int index = 1;
+ private List<IStackFrame> frames;
public FramesReader(XmlPullParser xpp) {
super(xpp);
@@ -24,18 +26,18 @@
public RubyStackFrame[] readFrames(RubyThread thread) {
- this.thread = thread ;
- this.frames = new ArrayList() ;
+ this.thread = thread;
+ this.frames = new ArrayList<IStackFrame>();
try {
this.read();
} catch (Exception ex) {
- RdtDebugCorePlugin.log(ex) ;
- return new RubyStackFrame[0] ;
+ RdtDebugCorePlugin.log(ex);
+ return new RubyStackFrame[0];
}
- RubyStackFrame[] frameArray = new RubyStackFrame[frames.size()] ;
- frames.toArray(frameArray) ;
- thread.setStackFrames(frameArray) ;
- return frameArray ;
+ RubyStackFrame[] frameArray = new RubyStackFrame[frames.size()];
+ frames.toArray(frameArray);
+ thread.setStackFrames(frameArray);
+ return frameArray;
}
@@ -43,21 +45,18 @@
String name = xpp.getName();
if (name.equals("frames")) {
- return true ;
+ return true;
}
if (name.equals("frame")) {
int line = Integer.parseInt(xpp.getAttributeValue("", "line"));
String file = xpp.getAttributeValue("", "file");
- this.frames.add(new RubyStackFrame(thread, file, line, index++)) ;
- return true ;
+ this.frames.add(new RubyStackFrame(thread, file, line, index++));
+ return true;
}
- return false ;
+ return false;
}
- protected boolean processEndElement(XmlPullParser xpp) {
-
- return xpp.getName().equals("frames") ;
+ protected boolean processEndElement(XmlPullParser xpp) {
+ return xpp.getName().equals("frames");
}
-
-
}
Modified: trunk/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/parsing/ThreadInfoReader.java
===================================================================
--- trunk/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/parsing/ThreadInfoReader.java 2007-02-28 14:14:21 UTC (rev 2064)
+++ trunk/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/parsing/ThreadInfoReader.java 2007-02-28 14:18:45 UTC (rev 2065)
@@ -2,6 +2,7 @@
import java.io.IOException;
import java.util.ArrayList;
+import java.util.List;
import org.rubypeople.rdt.internal.debug.core.model.ThreadInfo;
import org.xmlpull.v1.XmlPullParser;
@@ -9,7 +10,7 @@
public class ThreadInfoReader extends XmlStreamReader {
- private ArrayList threads = new ArrayList();
+ private List<ThreadInfo> threads = new ArrayList<ThreadInfo>();
public ThreadInfoReader(XmlPullParser xpp) {
super(xpp);
@@ -21,27 +22,25 @@
public ThreadInfo[] readThreads() throws XmlPullParserException, IOException, XmlStreamReaderException {
this.read();
- return (ThreadInfo[]) threads.toArray(new ThreadInfo[threads.size()]) ;
+ return (ThreadInfo[]) threads.toArray(new ThreadInfo[threads.size()]);
}
protected boolean processStartElement(XmlPullParser xpp) {
String name = xpp.getName();
if (name.equals("threads")) {
- return true ;
+ return true;
}
if (name.equals("thread")) {
- ThreadInfo info = new ThreadInfo() ;
- info.setId(Integer.parseInt(xpp.getAttributeValue("", "id")));
- info.setStatus(xpp.getAttributeValue("", "status")) ;
- threads.add(info) ;
- return true ;
+ int id = Integer.parseInt(xpp.getAttributeValue("", "id"));
+ String status = xpp.getAttributeValue("", "status");
+ threads.add(new ThreadInfo(id, status));
+ return true;
}
- return false ;
+ return false;
}
- protected boolean processEndElement(XmlPullParser xpp) {
-
- return xpp.getName().equals("threads") ;
+ protected boolean processEndElement(XmlPullParser xpp) {
+ return xpp.getName().equals("threads");
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
