Skip to content

Commit 6d2969e

Browse files
author
Ashwin Mishra
committed
Fixed gaze type errors
1 parent 826601b commit 6d2969e

File tree

3 files changed

+19
-9
lines changed

3 files changed

+19
-9
lines changed

src/edu/ysu/itrace/ControlView.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ public void partBroughtToTop(IWorkbenchPartReference partRef) {
384384
IEditorPart ep = (IEditorPart)partRef.getPart(true);
385385
ITrace.getDefault().setLineManager(ep.getEditorSite().getActionBars().getStatusLineManager());;
386386
}
387-
}
387+
}
388388

389389
@Override
390390
public void partClosed(IWorkbenchPartReference partRef) {

src/edu/ysu/itrace/HandlerBindManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class HandlerBindManager {
2929
public static void bind(IWorkbenchPartReference partRef) {
3030
IWorkbenchPart part = partRef.getPart(true);
3131
Control control = part.getAdapter(Control.class);
32-
32+
System.out.println(control);
3333
//is an EditorPart
3434
if (control != null) {
3535
bindControl(partRef, control, false);

src/edu/ysu/itrace/gaze/handlers/StyledTextGazeHandler.java

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package edu.ysu.itrace.gaze.handlers;
22

3-
import org.eclipse.jface.text.source.projection.ProjectionViewer;
3+
//import org.eclipse.jface.text.source.projection.ProjectionViewer;
44
import org.eclipse.swt.custom.StyledText;
55
import org.eclipse.swt.graphics.Point;
66

@@ -16,7 +16,7 @@
1616
*/
1717
public class StyledTextGazeHandler implements IGazeHandler {
1818
private StyledText targetStyledText;
19-
private ProjectionViewer projectionViewer;
19+
//private ProjectionViewer projectionViewer;
2020

2121
/**
2222
* Constructs a new gaze handler for the target StyledText object
@@ -43,16 +43,18 @@ public IStyledTextGazeResponse handleGaze(int absoluteX, int absoluteY,
4343
return null;
4444
AstManager astManager = (AstManager) targetStyledText
4545
.getData(ControlView.KEY_AST);
46-
projectionViewer = astManager.getProjectionViewer();
47-
int lineOffset = targetStyledText.getOffsetAtLine(targetStyledText.getLineIndex(relativeY));
46+
//projectionViewer = astManager.getProjectionViewer();
47+
lineIndex = targetStyledText.getLineIndex(relativeY);
48+
int lineOffset = targetStyledText.getOffsetAtLine(lineIndex);
49+
//int lineOffset = targetStyledText.getOffsetAtLine(targetStyledText.getLineIndex(relativeY));
4850
int offset;
4951
try{
5052
offset = targetStyledText.getOffsetAtLocation(new Point(relativeX, relativeY));
5153
}catch(IllegalArgumentException ex){
5254
return null;
5355
}
5456
col = offset - lineOffset;
55-
lineIndex = projectionViewer.widgetLine2ModelLine(targetStyledText.getLineIndex(relativeY));
57+
//lineIndex = projectionViewer.widgetLine2ModelLine(targetStyledText.getLineIndex(relativeY));
5658

5759
// (0, 0) relative to the control in absolute screen
5860
// coordinates.
@@ -93,8 +95,16 @@ public String getName() {
9395

9496
@Override
9597
public String getGazeType() {
96-
String[] splitPath = path.split("\\.");
97-
String type = splitPath[splitPath.length-1];
98+
/*String[] splitPath = path.split("\\.");
99+
String type = splitPath[splitPath.length-1];*/
100+
String type = path;
101+
int dotIndex;
102+
for(dotIndex=0; dotIndex<type.length();dotIndex++)
103+
if(path.charAt(dotIndex) == '.')
104+
break;
105+
if(dotIndex+1 == type.length())
106+
return "text";
107+
type = type.substring(dotIndex+1);
98108
return type;
99109
}
100110

0 commit comments

Comments
 (0)