Menu
▾
▴
rubyeclipse-commit — Every CVS commit creates a post to this list.
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
(41) |
Apr
(9) |
May
|
Jun
|
Jul
(39) |
Aug
(38) |
Sep
(135) |
Oct
(220) |
Nov
(75) |
Dec
(74) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(44) |
Feb
(160) |
Mar
(49) |
Apr
(69) |
May
(40) |
Jun
(52) |
Jul
(47) |
Aug
(51) |
Sep
(19) |
Oct
(22) |
Nov
(36) |
Dec
(76) |
| 2007 |
Jan
(154) |
Feb
(165) |
Mar
(186) |
Apr
(143) |
May
(175) |
Jun
(133) |
Jul
(203) |
Aug
(177) |
Sep
(136) |
Oct
|
Nov
|
Dec
|
|
From: <caw...@us...> - 2007-09-06 16:01:15
|
Revision: 3097
http://rubyeclipse.svn.sourceforge.net/rubyeclipse/?rev=3097&view=rev
Author: cawilliams
Date: 2007-09-06 09:01:12 -0700 (Thu, 06 Sep 2007)
Log Message:
-----------
enable showing error markers
Modified Paths:
--------------
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/viewsupport/DecoratingRubyLabelProvider.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/viewsupport/RubyElementImageProvider.java
Added Paths:
-----------
trunk/org.rubypeople.rdt.ui/icons/full/ovr16/error_co.gif
trunk/org.rubypeople.rdt.ui/icons/full/ovr16/warning_co.gif
Added: trunk/org.rubypeople.rdt.ui/icons/full/ovr16/error_co.gif
===================================================================
(Binary files differ)
Property changes on: trunk/org.rubypeople.rdt.ui/icons/full/ovr16/error_co.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/org.rubypeople.rdt.ui/icons/full/ovr16/warning_co.gif
===================================================================
(Binary files differ)
Property changes on: trunk/org.rubypeople.rdt.ui/icons/full/ovr16/warning_co.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/viewsupport/DecoratingRubyLabelProvider.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/viewsupport/DecoratingRubyLabelProvider.java 2007-09-06 15:44:39 UTC (rev 3096)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/viewsupport/DecoratingRubyLabelProvider.java 2007-09-06 16:01:12 UTC (rev 3097)
@@ -10,12 +10,11 @@
*******************************************************************************/
package org.rubypeople.rdt.internal.ui.viewsupport;
-import org.eclipse.swt.graphics.Color;
-
import org.eclipse.jface.viewers.DecoratingLabelProvider;
import org.eclipse.jface.viewers.IColorProvider;
-
+import org.eclipse.swt.graphics.Color;
import org.eclipse.ui.PlatformUI;
+import org.rubypeople.rdt.ui.ProblemsLabelDecorator;
public class DecoratingRubyLabelProvider extends DecoratingLabelProvider implements IColorProvider {
@@ -36,8 +35,7 @@
public DecoratingRubyLabelProvider(RubyUILabelProvider labelProvider, boolean errorTick) {
super(labelProvider, PlatformUI.getWorkbench().getDecoratorManager().getLabelDecorator());
if (errorTick) {
- // TODO Uncomment when we have a ProblemsLabelDecorator
- //labelProvider.addLabelDecorator(new ProblemsLabelDecorator(null));
+ labelProvider.addLabelDecorator(new ProblemsLabelDecorator(null));
}
}
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/viewsupport/RubyElementImageProvider.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/viewsupport/RubyElementImageProvider.java 2007-09-06 15:44:39 UTC (rev 3096)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/viewsupport/RubyElementImageProvider.java 2007-09-06 16:01:12 UTC (rev 3097)
@@ -101,14 +101,16 @@
private ImageDescriptor computeDescriptor(Object element, int flags) {
if (element instanceof IRubyElement) {
return getRubyImageDescriptor((IRubyElement) element, flags);
+ } else if (element instanceof IAdaptable) {
+ return getWorkbenchImageDescriptor((IAdaptable) element, flags);
} else if (element instanceof IFile) {
IFile file = (IFile) element;
- if (RubyCore.isRubyLikeFileName(file.getName())) { return getCUResourceImageDescriptor(
- file, flags); // image for a CU not on the build path
+ if (RubyCore.isRubyLikeFileName(file.getName())) {
+ return getCUResourceImageDescriptor(
+ file, flags); // image for a ruby script not on the build path
}
return getWorkbenchImageDescriptor(file, flags);
- } else if (element instanceof IAdaptable) { return getWorkbenchImageDescriptor(
- (IAdaptable) element, flags); }
+ }
return null;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <caw...@us...> - 2007-09-06 15:47:34
|
Revision: 3095
http://rubyeclipse.svn.sourceforge.net/rubyeclipse/?rev=3095&view=rev
Author: cawilliams
Date: 2007-09-06 08:43:07 -0700 (Thu, 06 Sep 2007)
Log Message:
-----------
use correct options map (from Aptana RDT Plugin, not from RDT Core)
Modified Paths:
--------------
trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/AndOrUsedOnRighthandAssignment.java
trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/ConstantNamingConvention.java
trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/DynamicVariableAliasesLocal.java
trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/MethodMissingWithoutRespondTo.java
Modified: trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/AndOrUsedOnRighthandAssignment.java
===================================================================
--- trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/AndOrUsedOnRighthandAssignment.java 2007-09-05 21:33:49 UTC (rev 3094)
+++ trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/AndOrUsedOnRighthandAssignment.java 2007-09-06 15:43:07 UTC (rev 3095)
@@ -12,7 +12,7 @@
public class AndOrUsedOnRighthandAssignment extends RubyLintVisitor {
public AndOrUsedOnRighthandAssignment(String contents) {
- super(contents);
+ super(AptanaRDTPlugin.getDefault().getOptions(), contents);
}
@Override
Modified: trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/ConstantNamingConvention.java
===================================================================
--- trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/ConstantNamingConvention.java 2007-09-05 21:33:49 UTC (rev 3094)
+++ trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/ConstantNamingConvention.java 2007-09-06 15:43:07 UTC (rev 3095)
@@ -4,6 +4,7 @@
import org.jruby.evaluator.Instruction;
import org.jruby.lexer.yacc.IDESourcePosition;
import org.jruby.lexer.yacc.ISourcePosition;
+import org.rubypeople.rdt.core.RubyCore;
import org.rubypeople.rdt.core.parser.warnings.RubyLintVisitor;
import com.aptana.rdt.AptanaRDTPlugin;
@@ -12,7 +13,7 @@
public class ConstantNamingConvention extends RubyLintVisitor {
public ConstantNamingConvention(String contents) {
- super(contents);
+ super(AptanaRDTPlugin.getDefault().getOptions(), contents);
}
@Override
Modified: trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/DynamicVariableAliasesLocal.java
===================================================================
--- trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/DynamicVariableAliasesLocal.java 2007-09-05 21:33:49 UTC (rev 3094)
+++ trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/DynamicVariableAliasesLocal.java 2007-09-06 15:43:07 UTC (rev 3095)
@@ -15,7 +15,7 @@
public class DynamicVariableAliasesLocal extends RubyLintVisitor {
public DynamicVariableAliasesLocal(String contents) {
- super(contents);
+ super(AptanaRDTPlugin.getDefault().getOptions(), contents);
}
@Override
Modified: trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/MethodMissingWithoutRespondTo.java
===================================================================
--- trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/MethodMissingWithoutRespondTo.java 2007-09-05 21:33:49 UTC (rev 3094)
+++ trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/MethodMissingWithoutRespondTo.java 2007-09-06 15:43:07 UTC (rev 3095)
@@ -19,7 +19,7 @@
private Map<String, DefnNode> methods = new HashMap<String, DefnNode>();
public MethodMissingWithoutRespondTo(String contents) {
- super(contents);
+ super(AptanaRDTPlugin.getDefault().getOptions(), contents);
}
@Override
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <caw...@us...> - 2007-09-06 15:47:08
|
Revision: 3096
http://rubyeclipse.svn.sourceforge.net/rubyeclipse/?rev=3096&view=rev
Author: cawilliams
Date: 2007-09-06 08:44:39 -0700 (Thu, 06 Sep 2007)
Log Message:
-----------
fix positioning of error
Modified Paths:
--------------
trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/ConstantNamingConvention.java
Modified: trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/ConstantNamingConvention.java
===================================================================
--- trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/ConstantNamingConvention.java 2007-09-06 15:43:07 UTC (rev 3095)
+++ trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/ConstantNamingConvention.java 2007-09-06 15:44:39 UTC (rev 3096)
@@ -4,7 +4,6 @@
import org.jruby.evaluator.Instruction;
import org.jruby.lexer.yacc.IDESourcePosition;
import org.jruby.lexer.yacc.ISourcePosition;
-import org.rubypeople.rdt.core.RubyCore;
import org.rubypeople.rdt.core.parser.warnings.RubyLintVisitor;
import com.aptana.rdt.AptanaRDTPlugin;
@@ -26,7 +25,7 @@
String name = iVisited.getName();
if (!name.toUpperCase().equals(name)) {
ISourcePosition pos = iVisited.getPosition();
- IDESourcePosition duh = new IDESourcePosition("", pos.getStartLine(), pos.getEndLine(), pos.getStartOffset(), pos.getStartOffset() + name.length() - 1);
+ IDESourcePosition duh = new IDESourcePosition("", pos.getStartLine(), pos.getEndLine(), pos.getStartOffset(), pos.getStartOffset() + name.length());
createProblem(duh, "Constant name doesn't match ALL_CAPS_WITH_UNDERSCORES convention: " + name);
}
return super.visitConstDeclNode(iVisited);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <caw...@us...> - 2007-09-05 21:33:49
|
Revision: 3094
http://rubyeclipse.svn.sourceforge.net/rubyeclipse/?rev=3094&view=rev
Author: cawilliams
Date: 2007-09-05 14:33:49 -0700 (Wed, 05 Sep 2007)
Log Message:
-----------
check debugger proxy is not null before adding breakpoint to it
Modified Paths:
--------------
trunk/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/model/RubyDebugTarget.java
Modified: trunk/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/model/RubyDebugTarget.java
===================================================================
--- trunk/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/model/RubyDebugTarget.java 2007-09-05 21:33:18 UTC (rev 3093)
+++ trunk/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/model/RubyDebugTarget.java 2007-09-05 21:33:49 UTC (rev 3094)
@@ -235,7 +235,8 @@
return;
}
if (!getBreakpoints().contains(breakpoint)) {
- this.getRubyDebuggerProxy().addBreakpoint(breakpoint);
+ if (this.getRubyDebuggerProxy() != null)
+ this.getRubyDebuggerProxy().addBreakpoint(breakpoint);
getBreakpoints().add(breakpoint);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <caw...@us...> - 2007-09-05 21:33:20
|
Revision: 3093
http://rubyeclipse.svn.sourceforge.net/rubyeclipse/?rev=3093&view=rev
Author: cawilliams
Date: 2007-09-05 14:33:18 -0700 (Wed, 05 Sep 2007)
Log Message:
-----------
when type is not null and is a Symbol, prepend ':' to valueString
Modified Paths:
--------------
trunk/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/model/RubyValue.java
Modified: trunk/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/model/RubyValue.java
===================================================================
--- trunk/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/model/RubyValue.java 2007-09-05 21:19:55 UTC (rev 3092)
+++ trunk/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/model/RubyValue.java 2007-09-05 21:33:18 UTC (rev 3093)
@@ -10,10 +10,6 @@
/**
* @author Administrator
*
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
*/
//see RubyDebugTarget for the reason why PlatformObject is being extended
@@ -39,6 +35,8 @@
} else if (this.valueString.endsWith("element(s))")) {
int index = this.valueString.substring(0, this.valueString.length() - 11).lastIndexOf("(");
this.valueString = this.valueString.substring(0, index).trim() + "[" + this.valueString.substring(index + 1, this.valueString.length() - 11).trim() + "]";
+ } else if (type != null && type.equals("Symbol")) {
+ this.valueString = ':' + this.valueString;
}
this.owner = owner;
this.hasChildren = hasChildren;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <caw...@us...> - 2007-09-05 21:19:56
|
Revision: 3092
http://rubyeclipse.svn.sourceforge.net/rubyeclipse/?rev=3092&view=rev
Author: cawilliams
Date: 2007-09-05 14:19:55 -0700 (Wed, 05 Sep 2007)
Log Message:
-----------
do a first cut at resolving old name of method in alias
Modified Paths:
--------------
trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/codeassist/SelectionEngine.java
Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/codeassist/SelectionEngine.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/codeassist/SelectionEngine.java 2007-09-05 21:11:38 UTC (rev 3091)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/codeassist/SelectionEngine.java 2007-09-05 21:19:55 UTC (rev 3092)
@@ -9,6 +9,7 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
+import org.jruby.ast.AliasNode;
import org.jruby.ast.ArgumentNode;
import org.jruby.ast.CallNode;
import org.jruby.ast.ClassNode;
@@ -77,7 +78,27 @@
}
Node selected = OffsetNodeLocator.Instance().getNodeAtOffset(root,
start);
-
+ if (selected instanceof AliasNode) {
+ // figure out if we're pointing at new name or old name.
+ AliasNode aliasNode = (AliasNode) selected;
+ int startOffset = aliasNode.getPosition().getStartOffset();
+ int diff = start - startOffset;
+ if (diff < (6 + aliasNode.getNewName().length() + 1)) return new IRubyElement[0]; // if we're not over the old name, don't resolve this to anything! FIXME Resolve it to the new method!
+ String methodName = aliasNode.getOldName();
+ // FIXME Only search within the current class/module scope!
+ // do a global search for method declarations matching this name
+ List<IRubyElement> possible = new ArrayList<IRubyElement>();
+ try {
+ List<SearchMatch> results = search(IRubyElement.METHOD, methodName, IRubySearchConstants.DECLARATIONS, SearchPattern.R_EXACT_MATCH);
+ for (SearchMatch match : results) {
+ IRubyElement element = (IRubyElement) match.getElement();
+ possible.add(element);
+ }
+ } catch (CoreException e) {
+ RubyCore.log(e);
+ }
+ return possible.toArray(new IRubyElement[possible.size()]);
+ }
if (selected instanceof Colon2Node) {
String simpleName = ((Colon2Node)selected).getName();
String fullyQualifiedName = ASTUtil.getFullyQualifiedName((Colon2Node) selected);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <caw...@us...> - 2007-09-05 21:11:39
|
Revision: 3091
http://rubyeclipse.svn.sourceforge.net/rubyeclipse/?rev=3091&view=rev
Author: cawilliams
Date: 2007-09-05 14:11:38 -0700 (Wed, 05 Sep 2007)
Log Message:
-----------
fix positioning of alias method names
Modified Paths:
--------------
trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/SourceElementParser.java
Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/SourceElementParser.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/SourceElementParser.java 2007-09-05 20:58:05 UTC (rev 3090)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/SourceElementParser.java 2007-09-05 21:11:38 UTC (rev 3091)
@@ -548,8 +548,8 @@
method.isClassLevel = inSingletonClass;
method.name = name;
method.visibility = convertVisibility(visibility);
- method.nameSourceStart = iVisited.getPosition().getStartOffset() + ALIAS.length();
- method.nameSourceEnd = iVisited.getPosition().getStartOffset() + ALIAS.length() + iVisited.getNewName().length() - 1;
+ method.nameSourceStart = iVisited.getPosition().getStartOffset() + ALIAS.length() - 1;
+ method.nameSourceEnd = iVisited.getPosition().getStartOffset() + ALIAS.length() - 1 + iVisited.getNewName().length() - 1;
method.parameterNames = new String[0]; // TODO Find the existing method and steal it's parameter names
requestor.enterMethod(method);
requestor.exitMethod(iVisited.getPosition().getEndOffset());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <caw...@us...> - 2007-09-05 20:58:06
|
Revision: 3090
http://rubyeclipse.svn.sourceforge.net/rubyeclipse/?rev=3090&view=rev
Author: cawilliams
Date: 2007-09-05 13:58:05 -0700 (Wed, 05 Sep 2007)
Log Message:
-----------
improve resolution of Constants/Type names (grab the namespace and try the fully qualified name if can't find after everything else)
Modified Paths:
--------------
trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/codeassist/SelectionEngine.java
Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/codeassist/SelectionEngine.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/codeassist/SelectionEngine.java 2007-09-05 20:37:48 UTC (rev 3089)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/codeassist/SelectionEngine.java 2007-09-05 20:58:05 UTC (rev 3090)
@@ -58,6 +58,7 @@
import org.rubypeople.rdt.internal.ti.util.FirstPrecursorNodeLocator;
import org.rubypeople.rdt.internal.ti.util.INodeAcceptor;
import org.rubypeople.rdt.internal.ti.util.OffsetNodeLocator;
+import org.rubypeople.rdt.internal.ti.util.ScopedNodeLocator;
public class SelectionEngine {
@@ -104,17 +105,37 @@
String name = constNode.getName();
// Try to find a matching constant in this script
// TODO Use convention of all caps versus camelcase to decided which to search for first?
- IRubyElement element = findChild(name, IRubyElement.CONSTANT, script);
- if (element != null) {
- return new IRubyElement[] { element };
+ try {
+ IRubySearchScope scope = SearchEngine.createRubySearchScope(new IRubyElement[] {script});
+ List<SearchMatch> matches = search(scope, IRubyElement.CONSTANT, name, IRubySearchConstants.DECLARATIONS, SearchPattern.R_EXACT_MATCH);
+ for (SearchMatch match : matches) {
+ IRubyElement element = (IRubyElement) match.getElement();
+ if (element != null) {
+ return new IRubyElement[] { element };
+ }
+ }
+ } catch (CoreException e) {
+ RubyCore.log(e);
}
// Now search for a type in this script
- element = findChild(name, IRubyElement.TYPE, script);
- if (element != null) {
- return new IRubyElement[] { element };
+ try {
+ IRubySearchScope scope = SearchEngine.createRubySearchScope(new IRubyElement[] {script});
+ List<SearchMatch> matches = search(scope, IRubyElement.TYPE, name, IRubySearchConstants.DECLARATIONS, SearchPattern.R_EXACT_MATCH);
+ for (SearchMatch match : matches) {
+ IRubyElement element = (IRubyElement) match.getElement();
+ if (element != null) {
+ return new IRubyElement[] { element };
+ }
+ }
+ } catch (CoreException e) {
+ RubyCore.log(e);
}
RubyElementRequestor completer = new RubyElementRequestor(script);
- return completer.findType(name);
+ IType[] types = completer.findType(name);
+ if (types != null && types.length > 0) return types;
+ String fullyQualifiedName = getFullyQualifiedName(root, name);
+ if (fullyQualifiedName == null) return new IRubyElement[0];
+ return completer.findType(fullyQualifiedName); // get fully qualified name of surrounding type!
}
if (isLocalVarRef(selected)) {
// TODO Try the local namespace first!
@@ -171,17 +192,48 @@
}
return new IRubyElement[0];
}
+
+ private String getFullyQualifiedName(Node root, String name) {
+ List<Node> surrounding = ScopedNodeLocator.Instance().findNodesInScope(root, new INodeAcceptor() {
+
+ public boolean doesAccept(Node node) {
+ return node instanceof ModuleNode || node instanceof ClassNode;
+ }
+
+ });
+ // drop last class/module
+ if (surrounding.size() < 2) return null;
+ surrounding.remove(surrounding.size() - 1);
+ StringBuffer buffer = new StringBuffer();
+ boolean first = true;
+ for (Node node : surrounding) {
+ if (!first) {
+ buffer.append("::");
+ }
+ buffer.append(ASTUtil.getNameReflectively(node));
+ if (first) {
+ first = false;
+ }
+ }
+ buffer.append("::");
+ buffer.append(name);
+ return buffer.toString();
+ }
private List<SearchMatch> search(int type, String patternString, int limitTo, int matchRule) throws CoreException {
+ return search(SearchEngine.createWorkspaceScope(), type, patternString, limitTo, matchRule);
+ }
+
+ private List<SearchMatch> search(IRubySearchScope scope, int type, String patternString, int limitTo, int matchRule) throws CoreException {
SearchEngine engine = new SearchEngine();
SearchPattern pattern = SearchPattern.createPattern(type, patternString, limitTo, matchRule);
SearchParticipant[] participants = new SearchParticipant[] {SearchEngine.getDefaultSearchParticipant()};
CollectingSearchRequestor requestor = new CollectingSearchRequestor();
- IRubySearchScope scope = SearchEngine.createWorkspaceScope();
engine.search(pattern, participants, scope, requestor, null);
return requestor.getResults();
}
+
private IType[] getReceiver(IRubyScript script, String source, Node selected, Node root, int start) {
List<IType> types = new ArrayList<IType>();
if ((selected instanceof FCallNode) || (selected instanceof VCallNode)) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <caw...@us...> - 2007-09-05 20:37:50
|
Revision: 3089
http://rubyeclipse.svn.sourceforge.net/rubyeclipse/?rev=3089&view=rev
Author: cawilliams
Date: 2007-09-05 13:37:48 -0700 (Wed, 05 Sep 2007)
Log Message:
-----------
when showing namespace of type in Open Type Dialog, use "::" to separate names, not "."
Modified Paths:
--------------
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/util/TypeInfo.java
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/util/TypeInfo.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/util/TypeInfo.java 2007-09-05 18:47:08 UTC (rev 3088)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/util/TypeInfo.java 2007-09-05 20:37:48 UTC (rev 3089)
@@ -206,7 +206,7 @@
}
for (int i= 0; i < fEnclosingNames.length; i++) {
if (buf.length() > 0) {
- buf.append('.');
+ buf.append("::");
}
buf.append(fEnclosingNames[i]);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <caw...@us...> - 2007-09-05 18:47:12
|
Revision: 3088
http://rubyeclipse.svn.sourceforge.net/rubyeclipse/?rev=3088&view=rev
Author: cawilliams
Date: 2007-09-05 11:47:08 -0700 (Wed, 05 Sep 2007)
Log Message:
-----------
add two more packages to runtime export
Modified Paths:
--------------
trunk/org.jruby/META-INF/MANIFEST.MF
Modified: trunk/org.jruby/META-INF/MANIFEST.MF
===================================================================
--- trunk/org.jruby/META-INF/MANIFEST.MF 2007-09-05 18:46:45 UTC (rev 3087)
+++ trunk/org.jruby/META-INF/MANIFEST.MF 2007-09-05 18:47:08 UTC (rev 3088)
@@ -17,6 +17,7 @@
edu.emory.mathcs.backport.java.util.concurrent.atomic,
edu.emory.mathcs.backport.java.util.concurrent.helpers,
edu.emory.mathcs.backport.java.util.concurrent.locks,
+ jline,
jregex,
jregex.util.io,
org.jruby,
@@ -67,5 +68,6 @@
org.jvyamlb.util,
org.objectweb.asm,
org.objectweb.asm.commons,
- org.objectweb.asm.signature
+ org.objectweb.asm.signature,
+ org.objectweb.asm.util
Bundle-Vendor: org.jruby
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <caw...@us...> - 2007-09-05 18:46:50
|
Revision: 3087
http://rubyeclipse.svn.sourceforge.net/rubyeclipse/?rev=3087&view=rev
Author: cawilliams
Date: 2007-09-05 11:46:45 -0700 (Wed, 05 Sep 2007)
Log Message:
-----------
clean up javadocs, add more possibilities for wait flag
Modified Paths:
--------------
trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/core/search/IRubySearchConstants.java
trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/core/search/SearchEngine.java
Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/core/search/IRubySearchConstants.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/core/search/IRubySearchConstants.java 2007-08-28 02:17:59 UTC (rev 3086)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/core/search/IRubySearchConstants.java 2007-09-05 18:46:45 UTC (rev 3087)
@@ -3,11 +3,6 @@
import org.rubypeople.rdt.internal.core.search.processing.IJob;
public interface IRubySearchConstants {
- /**
- * The search operation waits for the underlying indexer to finish indexing
- * the workspace before starting the search.
- */
- int WAIT_UNTIL_READY_TO_SEARCH = IJob.WaitUntilReady;
/**
* The search result is a declaration.
@@ -91,5 +86,24 @@
* More selective than using {@link #TYPE}.
*/
int MODULE= 5;
+
+ /* Waiting policies */
+
+ /**
+ * The search operation starts immediately, even if the underlying indexer
+ * has not finished indexing the workspace. Results will more likely
+ * not contain all the matches.
+ */
+ int FORCE_IMMEDIATE_SEARCH = IJob.ForceImmediate;
+ /**
+ * The search operation throws an <code>org.eclipse.core.runtime.OperationCanceledException</code>
+ * if the underlying indexer has not finished indexing the workspace.
+ */
+ int CANCEL_IF_NOT_READY_TO_SEARCH = IJob.CancelIfNotReady;
+ /**
+ * The search operation waits for the underlying indexer to finish indexing
+ * the workspace before starting the search.
+ */
+ int WAIT_UNTIL_READY_TO_SEARCH = IJob.WaitUntilReady;
}
Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/core/search/SearchEngine.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/core/search/SearchEngine.java 2007-08-28 02:17:59 UTC (rev 3086)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/core/search/SearchEngine.java 2007-09-05 18:46:45 UTC (rev 3087)
@@ -59,27 +59,23 @@
* or {@link SearchPattern#R_PREFIX_MATCH} if a prefix non case sensitive match is requested.
* @param searchFor determines the nature of the searched elements
* <ul>
- * <li>{@link IJavaSearchConstants#CLASS}: only look for classes</li>
- * <li>{@link IJavaSearchConstants#INTERFACE}: only look for interfaces</li>
- * <li>{@link IJavaSearchConstants#ENUM}: only look for enumeration</li>
- * <li>{@link IJavaSearchConstants#ANNOTATION_TYPE}: only look for annotation type</li>
- * <li>{@link IJavaSearchConstants#CLASS_AND_ENUM}: only look for classes and enumerations</li>
- * <li>{@link IJavaSearchConstants#CLASS_AND_INTERFACE}: only look for classes and interfaces</li>
- * <li>{@link IJavaSearchConstants#TYPE}: look for all types (ie. classes, interfaces, enum and annotation types)</li>
+ * <li>{@link IRubySearchConstants#CLASS}: only look for classes</li>
+ * <li>{@link IRubySearchConstants#MODULE}: only look for modules</li>
+ * <li>{@link IRubySearchConstants#TYPE}: look for all types</li>
* </ul>
* @param scope the scope to search in
* @param nameRequestor the requestor that collects the results of the search
* @param waitingPolicy one of
* <ul>
- * <li>{@link IJavaSearchConstants#FORCE_IMMEDIATE_SEARCH} if the search should start immediately</li>
- * <li>{@link IJavaSearchConstants#CANCEL_IF_NOT_READY_TO_SEARCH} if the search should be cancelled if the
+ * <li>{@link IRubySearchConstants#FORCE_IMMEDIATE_SEARCH} if the search should start immediately</li>
+ * <li>{@link IRubySearchConstants#CANCEL_IF_NOT_READY_TO_SEARCH} if the search should be cancelled if the
* underlying indexer has not finished indexing the workspace</li>
- * <li>{@link IJavaSearchConstants#WAIT_UNTIL_READY_TO_SEARCH} if the search should wait for the
+ * <li>{@link IRubySearchConstants#WAIT_UNTIL_READY_TO_SEARCH} if the search should wait for the
* underlying indexer to finish indexing the workspace</li>
* </ul>
* @param progressMonitor the progress monitor to report progress to, or <code>null</code> if no progress
* monitor is provided
- * @exception JavaModelException if the search failed. Reasons include:
+ * @exception RubyModelException if the search failed. Reasons include:
* <ul>
* <li>the classpath is incorrectly set</li>
* </ul>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <caw...@us...> - 2007-08-28 02:18:00
|
Revision: 3086
http://rubyeclipse.svn.sourceforge.net/rubyeclipse/?rev=3086&view=rev
Author: cawilliams
Date: 2007-08-27 19:17:59 -0700 (Mon, 27 Aug 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/org.rubypeople.rdt-feature/feature.xml
Modified: trunk/org.rubypeople.rdt-feature/feature.xml
===================================================================
--- trunk/org.rubypeople.rdt-feature/feature.xml 2007-08-27 21:17:03 UTC (rev 3085)
+++ trunk/org.rubypeople.rdt-feature/feature.xml 2007-08-28 02:17:59 UTC (rev 3086)
@@ -117,7 +117,7 @@
id="org.jruby"
download-size="2359"
install-size="2359"
- version="1.0.0.4196p"
+ version="1.0.0.4212p"
unpack="false"/>
<plugin
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <caw...@us...> - 2007-08-27 21:17:19
|
Revision: 3085
http://rubyeclipse.svn.sourceforge.net/rubyeclipse/?rev=3085&view=rev
Author: cawilliams
Date: 2007-08-27 14:17:03 -0700 (Mon, 27 Aug 2007)
Log Message:
-----------
update to latest JRuby, include all of lib folder's contents in binary build! (wasn't adding necessary libraries properly)
Modified Paths:
--------------
trunk/org.jruby/META-INF/MANIFEST.MF
trunk/org.jruby/build.properties
trunk/org.jruby/src.zip
Added Paths:
-----------
trunk/org.jruby/lib/jruby.jar
Removed Paths:
-------------
trunk/org.jruby/lib/jruby.jar
Modified: trunk/org.jruby/META-INF/MANIFEST.MF
===================================================================
--- trunk/org.jruby/META-INF/MANIFEST.MF 2007-08-27 21:02:07 UTC (rev 3084)
+++ trunk/org.jruby/META-INF/MANIFEST.MF 2007-08-27 21:17:03 UTC (rev 3085)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: JRuby Plug-in
Bundle-SymbolicName: org.jruby
-Bundle-Version: 1.0.0.4196p
+Bundle-Version: 1.0.0.4212p
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime
Bundle-ClassPath: lib/asm-commons-3.0.jar,
Modified: trunk/org.jruby/build.properties
===================================================================
--- trunk/org.jruby/build.properties 2007-08-27 21:02:07 UTC (rev 3084)
+++ trunk/org.jruby/build.properties 2007-08-27 21:17:03 UTC (rev 3085)
@@ -1,6 +1,7 @@
output.. = bin/
bin.includes = META-INF/,\
- lib/jruby.jar,\
- lib/asm-commons-2.2.3.jar,\
- lib/asm-2.2.3.jar,\
- lib/backport-util-concurrent.jar
+ lib/
+src.includes = patches/,\
+ src.zip,\
+ lib/,\
+ META-INF/
Deleted: trunk/org.jruby/lib/jruby.jar
===================================================================
(Binary files differ)
Added: trunk/org.jruby/lib/jruby.jar
===================================================================
--- trunk/org.jruby/lib/jruby.jar (rev 0)
+++ trunk/org.jruby/lib/jruby.jar 2007-08-27 21:17:03 UTC (rev 3085)
@@ -0,0 +1,28053 @@
+PK
+ |
|
From: <caw...@us...> - 2007-08-27 21:02:09
|
Revision: 3084
http://rubyeclipse.svn.sourceforge.net/rubyeclipse/?rev=3084&view=rev
Author: cawilliams
Date: 2007-08-27 14:02:07 -0700 (Mon, 27 Aug 2007)
Log Message:
-----------
persist breakpoints
Modified Paths:
--------------
trunk/org.rubypeople.rdt.debug.core/plugin.xml
trunk/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/debug/core/RubyLineBreakpoint.java
trunk/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/RdtDebugCorePlugin.java
trunk/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/RubyExceptionBreakpoint.java
trunk/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/model/RubyDebugTarget.java
Modified: trunk/org.rubypeople.rdt.debug.core/plugin.xml
===================================================================
--- trunk/org.rubypeople.rdt.debug.core/plugin.xml 2007-08-27 21:01:08 UTC (rev 3083)
+++ trunk/org.rubypeople.rdt.debug.core/plugin.xml 2007-08-27 21:02:07 UTC (rev 3084)
@@ -2,23 +2,81 @@
<?eclipse version="3.0"?>
<plugin>
- <extension
- id="RubyBreakpointMarker"
+ <extension
+ point="org.eclipse.debug.core.breakpoints">
+ <breakpoint
+ markerType="org.rubypeople.rdt.debug.core.rubyLineBreakpointMarker"
+ class="org.rubypeople.rdt.debug.core.RubyLineBreakpoint"
+ id="rubyBreakpointMarker"
+ name="%rubyBreakpoint.name">
+ </breakpoint>
+ <breakpoint
+ markerType="org.rubypeople.rdt.debug.core.rubyExceptionBreakpointMarker"
+ class="org.rubypeople.rdt.internal.debug.core.RubyExceptionBreakpoint"
+ id="rubyExceptionBreakpoint"
+ name="%rubyExceptionBreakpoint.name">
+ </breakpoint>
+ </extension>
+ <extension
+ id="rubyBreakpointMarker"
point="org.eclipse.core.resources.markers">
<super
type="org.eclipse.debug.core.breakpointMarker">
</super>
+ </extension>
+ <extension
+ id="commonRubyLineBreakpointMarker"
+ point="org.eclipse.core.resources.markers">
+ <super
+ type="org.rubypeople.rdt.debug.core.rubyBreakpointMarker">
+ </super>
+ <super
+ type="org.eclipse.debug.core.lineBreakpointMarker">
+ </super>
<persistent
value="true">
</persistent>
+ <attribute
+ name="org.rubypeople.rdt.debug.core.typeName">
+ </attribute>
+ <attribute
+ name="org.rubypeople.rdt.debug.core.installCount">
+ </attribute>
+ <attribute
+ name="org.rubypeople.rdt.debug.core.hitCount">
+ </attribute>
+ <attribute
+ name="org.rubypeople.rdt.debug.core.expired">
+ </attribute>
</extension>
<extension
- point="org.eclipse.debug.core.breakpoints">
- <breakpoint
- markerType="RubyBreakpointMarker"
- class="org.rubypeople.rdt.debug.core.RubyLineBreakpoint"
- id="RubyLineBreakpoint">
- </breakpoint>
+ id="rubyLineBreakpointMarker"
+ point="org.eclipse.core.resources.markers">
+ <super
+ type="org.rubypeople.rdt.debug.core.commonRubyLineBreakpointMarker">
+ </super>
+ <persistent
+ value="true">
+ </persistent>
</extension>
+ <extension
+ id="rubyExceptionBreakpointMarker"
+ point="org.eclipse.core.resources.markers">
+ <super
+ type="org.rubypeople.rdt.debug.core.rubyBreakpointMarker">
+ </super>
+ <persistent
+ value="true">
+ </persistent>
+ <attribute
+ name="org.rubypeople.rdt.debug.core.caught">
+ </attribute>
+ <attribute
+ name="org.rubypeople.rdt.debug.core.uncaught">
+ </attribute>
+ <attribute
+ name="org.rubypeople.rdt.debug.core.checked">
+ </attribute>
+ </extension>
</plugin>
Modified: trunk/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/debug/core/RubyLineBreakpoint.java
===================================================================
--- trunk/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/debug/core/RubyLineBreakpoint.java 2007-08-27 21:01:08 UTC (rev 3083)
+++ trunk/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/debug/core/RubyLineBreakpoint.java 2007-08-27 21:02:07 UTC (rev 3084)
@@ -7,18 +7,24 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.debug.core.DebugException;
+import org.eclipse.debug.core.model.IBreakpoint;
import org.eclipse.debug.core.model.LineBreakpoint;
+import org.rubypeople.rdt.internal.debug.core.RdtDebugCorePlugin;
public class RubyLineBreakpoint extends LineBreakpoint {
- public static final String RUBY_BREAKPOINT_MARKER = "org.rubypeople.rdt.debug.core.RubyBreakpointMarker"; //$NON-NLS-1$
+ public static final String RUBY_BREAKPOINT_MARKER = "org.rubypeople.rdt.debug.core.rubyLineBreakpointMarker"; //$NON-NLS-1$
private int index = -1 ; // index of breakpoint on ruby debugger side
+ public RubyLineBreakpoint() {
+ }
+
public RubyLineBreakpoint(final IResource resource, final int lineNumber) throws CoreException {
IWorkspaceRunnable wr = new IWorkspaceRunnable() {
public void run(IProgressMonitor monitor) throws CoreException {
setMarker(resource.createMarker(RUBY_BREAKPOINT_MARKER));
getMarker().setAttribute(IMarker.LINE_NUMBER, lineNumber + 1);
+ getMarker().setAttribute(IBreakpoint.ID, getModelIdentifier());
getMarker().setAttribute(REGISTERED, false);
// setEnabled must be set before calling setRegistered
setEnabled(true);
@@ -57,7 +63,7 @@
}
public String getModelIdentifier() {
- return "org.rubypeople.rdt.debug";
+ return RdtDebugCorePlugin.MODEL_IDENTIFIER;
}
public int getIndex() {
Modified: trunk/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/RdtDebugCorePlugin.java
===================================================================
--- trunk/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/RdtDebugCorePlugin.java 2007-08-27 21:01:08 UTC (rev 3083)
+++ trunk/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/RdtDebugCorePlugin.java 2007-08-27 21:02:07 UTC (rev 3084)
@@ -11,6 +11,7 @@
public class RdtDebugCorePlugin extends Plugin {
public static final String PLUGIN_ID = "org.rubypeople.rdt.debug.core"; //$NON-NLS-1$
+ public static final String MODEL_IDENTIFIER = "org.rubypeople.rdt.debug";
private static boolean isRubyDebuggerVerbose = false;
Modified: trunk/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/RubyExceptionBreakpoint.java
===================================================================
--- trunk/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/RubyExceptionBreakpoint.java 2007-08-27 21:01:08 UTC (rev 3083)
+++ trunk/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/RubyExceptionBreakpoint.java 2007-08-27 21:02:07 UTC (rev 3084)
@@ -17,12 +17,18 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.debug.core.DebugException;
import org.eclipse.debug.core.model.Breakpoint;
+import org.eclipse.debug.core.model.IBreakpoint;
import org.rubypeople.rdt.debug.core.RubyLineBreakpoint;
public class RubyExceptionBreakpoint extends Breakpoint {
- private static String RUBY_EXCEPTION_ATTR = "RubyException" ;
+ private static String RUBY_EXCEPTION_ATTR = "RubyException";
+ private static final String RUBY_EXCEPTION_BREAKPOINT= "org.rubypeople.rdt.debug.core.rubyExceptionBreakpointMarker"; //$NON-NLS-1$
+
+ public RubyExceptionBreakpoint() {
+ }
+
public RubyExceptionBreakpoint(final String exception) throws CoreException {
// we need to have a resource, because the marker needs it (BTW: why the hell do
// we need a marker for?) Possible Answer: so that changes can be detected and
@@ -32,8 +38,9 @@
IWorkspaceRunnable wr = new IWorkspaceRunnable() {
public void run(IProgressMonitor monitor) throws CoreException {
- setMarker(resource.createMarker(RubyLineBreakpoint.RUBY_BREAKPOINT_MARKER));
+ setMarker(resource.createMarker(RUBY_EXCEPTION_BREAKPOINT));
getMarker().setAttribute(RUBY_EXCEPTION_ATTR, exception);
+ getMarker().setAttribute(IBreakpoint.ID, getModelIdentifier());
setEnabled(true);
// not yet registered with the BreakpointManager ..
getMarker().setAttribute(REGISTERED, false);
@@ -56,7 +63,7 @@
}
public String getModelIdentifier() {
- return "org.rubypeople.rdt.debug";
+ return RdtDebugCorePlugin.MODEL_IDENTIFIER;
}
public String getException() throws CoreException {
Modified: trunk/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/model/RubyDebugTarget.java
===================================================================
--- trunk/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/model/RubyDebugTarget.java 2007-08-27 21:01:08 UTC (rev 3083)
+++ trunk/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/model/RubyDebugTarget.java 2007-08-27 21:02:07 UTC (rev 3084)
@@ -22,6 +22,7 @@
import org.eclipse.debug.core.model.IMemoryBlock;
import org.eclipse.debug.core.model.IProcess;
import org.eclipse.debug.core.model.IThread;
+import org.rubypeople.rdt.debug.core.RubyLineBreakpoint;
import org.rubypeople.rdt.internal.debug.core.RdtDebugCorePlugin;
import org.rubypeople.rdt.internal.debug.core.RubyDebuggerProxy;
import org.rubypeople.rdt.internal.debug.core.SuspensionPoint;
@@ -40,6 +41,7 @@
private RubyDebuggerProxy rubyDebuggerProxy;
private int port;
private File debugParameterFile;
+ private ArrayList<IBreakpoint> fBreakPoints;
public RubyDebugTarget(ILaunch launch) {
this(launch, null);
@@ -54,10 +56,10 @@
this.port = port;
this.process = process;
this.threads = new RubyThread[0];
+ this.fBreakPoints = new ArrayList<IBreakpoint>(5);
this.isTerminated = false;
if (DebugPlugin.getDefault() != null) { // null only expected in Unit test
- IBreakpointManager manager = DebugPlugin.getDefault().getBreakpointManager();
- manager.addBreakpointListener(this);
+ initializeBreakpoints();
}
addDebugParameter("$RemoteDebugPort=" + port);
}
@@ -232,14 +234,22 @@
if (isTerminated) {
return;
}
- this.getRubyDebuggerProxy().addBreakpoint(breakpoint);
+ if (!getBreakpoints().contains(breakpoint)) {
+ this.getRubyDebuggerProxy().addBreakpoint(breakpoint);
+ getBreakpoints().add(breakpoint);
+ }
}
+ private List<IBreakpoint> getBreakpoints() {
+ return fBreakPoints;
+ }
+
public void breakpointRemoved(IBreakpoint breakpoint, IMarkerDelta arg1) {
if (isTerminated) {
return;
}
this.getRubyDebuggerProxy().removeBreakpoint(breakpoint);
+ fBreakPoints.remove(breakpoint);
}
public void breakpointChanged(IBreakpoint breakpoint, IMarkerDelta arg1) {
@@ -298,6 +308,48 @@
}
return debugParameterFile;
}
+
+ /**
+ * Reinstall all breakpoints installed in the given resources
+ */
+ public void reinstallBreakpointsIn(List resources, List classNames) {
+ List breakpoints= getBreakpoints();
+ IBreakpoint[] copy= new IBreakpoint[breakpoints.size()];
+ breakpoints.toArray(copy);
+ IBreakpoint breakpoint= null;
+// String installedType= null;
+
+ for (int i= 0; i < copy.length; i++) {
+ breakpoint= copy[i];
+ if (breakpoint instanceof RubyLineBreakpoint) {
+// try {
+// installedType= breakpoint.getTypeName();
+// if (classNames.contains(installedType)) {
+ breakpointRemoved(breakpoint, null);
+ breakpointAdded(breakpoint);
+// }
+// } catch (CoreException ce) {
+// RdtDebugCorePlugin.log(ce);
+// continue;
+// }
+ }
+ }
+ }
+
+ /**
+ * Installs all Ruby breakpoints that currently exist in
+ * the breakpoint manager
+ */
+ protected void initializeBreakpoints() {
+ IBreakpointManager manager= DebugPlugin.getDefault().getBreakpointManager();
+ manager.addBreakpointListener(this);
+ IBreakpoint[] bps = manager.getBreakpoints(RdtDebugCorePlugin.MODEL_IDENTIFIER);
+ for (int i = 0; i < bps.length; i++) {
+ if (bps[i].getModelIdentifier().equals(RdtDebugCorePlugin.MODEL_IDENTIFIER)) {
+ breakpointAdded(bps[i]);
+ }
+ }
+ }
private boolean addDebugParameter(String line) {
PrintWriter writer = null;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <caw...@us...> - 2007-08-27 21:01:11
|
Revision: 3083
http://rubyeclipse.svn.sourceforge.net/rubyeclipse/?rev=3083&view=rev
Author: cawilliams
Date: 2007-08-27 14:01:08 -0700 (Mon, 27 Aug 2007)
Log Message:
-----------
replace all instances of "non-Rubydoc" with "non-Javadoc"
Modified Paths:
--------------
trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/HierarchyScope.java
Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/HierarchyScope.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/HierarchyScope.java 2007-08-24 19:36:13 UTC (rev 3082)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/HierarchyScope.java 2007-08-27 21:01:08 UTC (rev 3083)
@@ -56,7 +56,7 @@
public boolean needsRefresh;
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* Adds the given resource to this search scope.
*/
public void add(IResource element) {
@@ -71,7 +71,7 @@
elements[elementCount++] = element;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* Creates a new hiearchy scope for the given type.
*/
public HierarchyScope(IType type, WorkingCopyOwner owner) throws RubyModelException {
@@ -179,7 +179,7 @@
}
}
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see IRubySearchScope#encloses(String)
*/
public boolean encloses(String resourcePath) {
@@ -215,7 +215,7 @@
}
return false;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see IRubySearchScope#encloses(IRubyElement)
*/
public boolean encloses(IRubyElement element) {
@@ -262,7 +262,7 @@
}
return false;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see IRubySearchScope#enclosingProjectsAndJars()
* @deprecated
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <caw...@us...> - 2007-08-24 19:36:22
|
Revision: 3082
http://rubyeclipse.svn.sourceforge.net/rubyeclipse/?rev=3082&view=rev
Author: cawilliams
Date: 2007-08-24 12:36:13 -0700 (Fri, 24 Aug 2007)
Log Message:
-----------
replace all instances of "non-Rubydoc" with "non-Javadoc"
Modified Paths:
--------------
trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/DefaultEntryResolver.java
trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/DefaultProjectLoadpathEntry.java
trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RubyVMRuntimeLoadpathEntryResolver.java
trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RuntimeLoadpathEntry.java
trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RuntimeLoadpathEntryResolver.java
trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/StandardLoadpathProvider.java
Modified: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/DefaultEntryResolver.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/DefaultEntryResolver.java 2007-08-24 19:36:04 UTC (rev 3081)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/DefaultEntryResolver.java 2007-08-24 19:36:13 UTC (rev 3082)
@@ -27,7 +27,7 @@
* Default resolver for a contributed classpath entry
*/
public class DefaultEntryResolver implements IRuntimeLoadpathEntryResolver {
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeLoadpathEntryResolver#resolveRuntimeLoadpathEntry(org.eclipse.jdt.launching.IRuntimeLoadpathEntry, org.eclipse.debug.core.ILaunchConfiguration)
*/
public IRuntimeLoadpathEntry[] resolveRuntimeLoadpathEntry(IRuntimeLoadpathEntry entry, ILaunchConfiguration configuration) throws CoreException {
@@ -42,7 +42,7 @@
}
return (IRuntimeLoadpathEntry[]) resolved.toArray(new IRuntimeLoadpathEntry[resolved.size()]);
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeLoadpathEntryResolver#resolveRuntimeLoadpathEntry(org.eclipse.jdt.launching.IRuntimeLoadpathEntry, org.eclipse.jdt.core.IRubyProject)
*/
public IRuntimeLoadpathEntry[] resolveRuntimeLoadpathEntry(IRuntimeLoadpathEntry entry, IRubyProject project) throws CoreException {
@@ -58,7 +58,7 @@
return (IRuntimeLoadpathEntry[]) resolved.toArray(new IRuntimeLoadpathEntry[resolved.size()]);
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeLoadpathEntryResolver#resolveVMInstall(org.eclipse.jdt.core.ILoadpathEntry)
*/
public IVMInstall resolveVMInstall(ILoadpathEntry entry) throws CoreException {
Modified: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/DefaultProjectLoadpathEntry.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/DefaultProjectLoadpathEntry.java 2007-08-24 19:36:04 UTC (rev 3081)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/DefaultProjectLoadpathEntry.java 2007-08-24 19:36:13 UTC (rev 3082)
@@ -60,7 +60,7 @@
setRubyProject(project);
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.launching.AbstractRuntimeLoadpathEntry#buildMemento(org.w3c.dom.Document, org.w3c.dom.Element)
*/
protected void buildMemento(Document document, Element memento) throws CoreException {
@@ -68,7 +68,7 @@
memento.setAttribute("exportedEntriesOnly", Boolean.toString(fExportedEntriesOnly)); //$NON-NLS-1$
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeLoadpathEntry2#initializeFrom(org.w3c.dom.Element)
*/
public void initializeFrom(Element memento) throws CoreException {
@@ -85,13 +85,13 @@
fExportedEntriesOnly = Boolean.valueOf(name).booleanValue();
}
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeLoadpathEntry2#getTypeId()
*/
public String getTypeId() {
return TYPE_ID;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeLoadpathEntry#getType()
*/
public int getType() {
@@ -102,28 +102,28 @@
return getRubyProject().getProject();
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeLoadpathEntry#getLocation()
*/
public String getLocation() {
return getProject().getLocation().toOSString();
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeLoadpathEntry#getPath()
*/
public IPath getPath() {
return getProject().getFullPath();
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeLoadpathEntry#getResource()
*/
public IResource getResource() {
return getProject();
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.rubypeople.rdt.launching.IRuntimeLoadpathEntry2#getRuntimeLoadpathEntries(org.eclipse.debug.core.ILaunchConfiguration)
*/
public IRuntimeLoadpathEntry[] getRuntimeLoadpathEntries(ILaunchConfiguration configuration) throws CoreException {
@@ -295,13 +295,13 @@
}
return;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeLoadpathEntry2#isComposite()
*/
public boolean isComposite() {
return true;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeLoadpathEntry2#getName()
*/
public String getName() {
@@ -310,7 +310,7 @@
}
return MessageFormat.format(LaunchingMessages.DefaultProjectLoadpathEntry_4, getRubyProject().getElementName());
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see java.lang.Object#equals(java.lang.Object)
*/
public boolean equals(Object obj) {
@@ -321,7 +321,7 @@
}
return false;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see java.lang.Object#hashCode()
*/
public int hashCode() {
Modified: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RubyVMRuntimeLoadpathEntryResolver.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RubyVMRuntimeLoadpathEntryResolver.java 2007-08-24 19:36:04 UTC (rev 3081)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RubyVMRuntimeLoadpathEntryResolver.java 2007-08-24 19:36:13 UTC (rev 3082)
@@ -158,7 +158,7 @@
return null;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeLoadpathEntryResolver2#isVMInstallReference(org.eclipse.jdt.core.ILoadpathEntry)
*/
public boolean isVMInstallReference(ILoadpathEntry entry) {
Modified: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RuntimeLoadpathEntry.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RuntimeLoadpathEntry.java 2007-08-24 19:36:04 UTC (rev 3081)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RuntimeLoadpathEntry.java 2007-08-24 19:36:13 UTC (rev 3082)
@@ -551,7 +551,7 @@
return super.toString();
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeLoadpathEntry#getRubyProject()
*/
public IRubyProject getRubyProject() {
Modified: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RuntimeLoadpathEntryResolver.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RuntimeLoadpathEntryResolver.java 2007-08-24 19:36:04 UTC (rev 3081)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RuntimeLoadpathEntryResolver.java 2007-08-24 19:36:13 UTC (rev 3082)
@@ -90,7 +90,7 @@
return getResolver().resolveRuntimeLoadpathEntry(entry, project);
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeLoadpathEntryResolver2#isVMInstallReference(org.eclipse.jdt.core.ILoadpathEntry)
*/
public boolean isVMInstallReference(ILoadpathEntry entry) {
Modified: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/StandardLoadpathProvider.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/StandardLoadpathProvider.java 2007-08-24 19:36:04 UTC (rev 3081)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/StandardLoadpathProvider.java 2007-08-24 19:36:13 UTC (rev 3082)
@@ -29,7 +29,7 @@
*/
public class StandardLoadpathProvider implements IRuntimeLoadpathProvider {
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeLoadpathProvider#computeUnresolvedLoadpath(org.eclipse.debug.core.ILaunchConfiguration)
*/
public IRuntimeLoadpathEntry[] computeUnresolvedLoadpath(ILaunchConfiguration configuration) throws CoreException {
@@ -64,7 +64,7 @@
return recoverRuntimePath(configuration, IRubyLaunchConfigurationConstants.ATTR_LOADPATH);
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.launching.IRuntimeLoadpathProvider#resolveLoadpath(org.eclipse.jdt.launching.IRuntimeLoadpathEntry[], org.eclipse.debug.core.ILaunchConfiguration)
*/
public IRuntimeLoadpathEntry[] resolveLoadpath(IRuntimeLoadpathEntry[] entries, ILaunchConfiguration configuration) throws CoreException {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <caw...@us...> - 2007-08-24 19:36:13
|
Revision: 3081
http://rubyeclipse.svn.sourceforge.net/rubyeclipse/?rev=3081&view=rev
Author: cawilliams
Date: 2007-08-24 12:36:04 -0700 (Fri, 24 Aug 2007)
Log Message:
-----------
replace all instances of "non-Rubydoc" with "non-Javadoc"
Modified Paths:
--------------
trunk/org.rubypeople.rdt.testunit/src/org/rubypeople/rdt/internal/testunit/wizards/NewTestCaseCreationWizard.java
Modified: trunk/org.rubypeople.rdt.testunit/src/org/rubypeople/rdt/internal/testunit/wizards/NewTestCaseCreationWizard.java
===================================================================
--- trunk/org.rubypeople.rdt.testunit/src/org/rubypeople/rdt/internal/testunit/wizards/NewTestCaseCreationWizard.java 2007-08-24 19:35:51 UTC (rev 3080)
+++ trunk/org.rubypeople.rdt.testunit/src/org/rubypeople/rdt/internal/testunit/wizards/NewTestCaseCreationWizard.java 2007-08-24 19:36:04 UTC (rev 3081)
@@ -38,14 +38,14 @@
addPage(fPage);
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.ui.wizards.NewElementWizard#finishPage(org.eclipse.core.runtime.IProgressMonitor)
*/
protected void finishPage(IProgressMonitor monitor) throws InterruptedException, CoreException {
fPage.createType(monitor); // use the full progress monitor
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jface.wizard.IWizard#performFinish()
*/
public boolean performFinish() {
@@ -60,7 +60,7 @@
return res;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.ui.wizards.NewElementWizard#getCreatedElement()
*/
public IRubyElement getCreatedElement() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <caw...@us...> - 2007-08-24 19:35:53
|
Revision: 3080
http://rubyeclipse.svn.sourceforge.net/rubyeclipse/?rev=3080&view=rev
Author: cawilliams
Date: 2007-08-24 12:35:51 -0700 (Fri, 24 Aug 2007)
Log Message:
-----------
replace all instances of "non-Rubydoc" with "non-Javadoc"
Modified Paths:
--------------
trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/BatchOperation.java
trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyScript.java
trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyType.java
trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/SourceRefElement.java
Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/BatchOperation.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/BatchOperation.java 2007-08-24 19:35:46 UTC (rev 3079)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/BatchOperation.java 2007-08-24 19:35:51 UTC (rev 3080)
@@ -29,7 +29,7 @@
this.runnable = runnable;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.core.RubyModelOperation#executeOperation()
*/
protected void executeOperation() throws RubyModelException {
@@ -49,7 +49,7 @@
}
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.core.RubyModelOperation#verify()
*/
protected IRubyModelStatus verify() {
Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyScript.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyScript.java 2007-08-24 19:35:46 UTC (rev 3079)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyScript.java 2007-08-24 19:35:51 UTC (rev 3080)
@@ -296,7 +296,7 @@
}
/*
- * (non-Rubydoc)
+ * (non-Javadoc)
*
* @see org.rubypeople.rdt.internal.core.parser.RubyElement#getElementType()
*/
@@ -305,7 +305,7 @@
}
/*
- * (non-Rubydoc)
+ * (non-Javadoc)
*
* @see org.rubypeople.rdt.core.IRubyScript#reconcile()
*/
@@ -314,7 +314,7 @@
}
/*
- * (non-Rubydoc)
+ * (non-Javadoc)
*
* @see org.rubypeople.rdt.core.IRubyScript#reconcile()
*/
@@ -341,7 +341,7 @@
}
/*
- * (non-Rubydoc)
+ * (non-Javadoc)
*
* @see org.rubypeople.rdt.core.ISourceReference#getSourceRange()
*/
@@ -357,7 +357,7 @@
}
/*
- * (non-Rubydoc)
+ * (non-Javadoc)
*
* @see org.rubypeople.rdt.core.ISourceReference#getSource()
*/
Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyType.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyType.java 2007-08-24 19:35:46 UTC (rev 3079)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyType.java 2007-08-24 19:35:51 UTC (rev 3080)
@@ -183,7 +183,7 @@
}
/*
- * (non-Rubydoc)
+ * (non-Javadoc)
*
* @see org.rubypeople.rdt.core.IRubyType#isClass()
*/
Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/SourceRefElement.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/SourceRefElement.java 2007-08-24 19:35:46 UTC (rev 3079)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/SourceRefElement.java 2007-08-24 19:35:51 UTC (rev 3080)
@@ -44,7 +44,7 @@
}
/*
- * (non-Rubydoc)
+ * (non-Javadoc)
*
* @see org.rubypeople.rdt.core.IMember#getRubyScript()
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <caw...@us...> - 2007-08-24 19:35:50
|
Revision: 3079
http://rubyeclipse.svn.sourceforge.net/rubyeclipse/?rev=3079&view=rev
Author: cawilliams
Date: 2007-08-24 12:35:46 -0700 (Fri, 24 Aug 2007)
Log Message:
-----------
replace all instances of "non-Rubydoc" with "non-Javadoc"
Modified Paths:
--------------
trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/actions/EvaluateAction.java
Modified: trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/actions/EvaluateAction.java
===================================================================
--- trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/actions/EvaluateAction.java 2007-08-24 19:35:33 UTC (rev 3078)
+++ trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/actions/EvaluateAction.java 2007-08-24 19:35:46 UTC (rev 3079)
@@ -556,7 +556,7 @@
return message;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.ui.IActionDelegate#run(IAction)
*/
public void run(IAction action) {
@@ -564,7 +564,7 @@
run();
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.ui.IActionDelegate#selectionChanged(IAction, ISelection)
*/
public void selectionChanged(IAction action, ISelection selection) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <caw...@us...> - 2007-08-24 19:35:34
|
Revision: 3078
http://rubyeclipse.svn.sourceforge.net/rubyeclipse/?rev=3078&view=rev
Author: cawilliams
Date: 2007-08-24 12:35:33 -0700 (Fri, 24 Aug 2007)
Log Message:
-----------
replace all instances of "non-Rubydoc" with "non-Javadoc"
Modified Paths:
--------------
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/CalleeMethodWrapper.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/CallerMethodWrapper.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/MethodReferencesSearchRequestor.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/RubyImplementorFinder.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/util/SuperTypeHierarchyCache.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/util/TypeFilter.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/actions/NewWizardsActionGroup.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/actions/WorkbenchRunnableAdapter.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/callhierarchy/CallHierarchyFiltersActionGroup.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/callhierarchy/CallHierarchyLabelDecorator.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/callhierarchy/FiltersDialog.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/callhierarchy/HistoryListAction.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/callhierarchy/SearchScopeActionGroup.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/callhierarchy/SearchScopeHierarchyAction.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/callhierarchy/SearchScopeProjectAction.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/callhierarchy/SearchScopeWorkingSetAction.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/callhierarchy/SearchScopeWorkspaceAction.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/callhierarchy/SelectWorkingSetAction.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/filters/NamePatternFilter.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/BuildPathsPropertyPage.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/CodeFormatterPreferencePage.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/KeywordConfigurationBlock.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/KeywordPreferencePage.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/OptionsConfigurationBlock.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/ProblemSeveritiesConfigurationBlock.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/ProblemSeveritiesPreferencePage.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/ProjectSelectionDialog.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/PropertyAndPreferencePage.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/TodoTaskConfigurationBlock.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/TodoTaskPreferencePage.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/formatter/IndentationTabPage.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/formatter/ModifyDialog.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/rubyeditor/RubyOutlinePage.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/search/FiltersDialog.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/search/RubySearchPage.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/search/RubySearchResult.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/search/RubySearchResultPage.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/AbstractInformationControl.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/correction/CUCorrectionProposal.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/correction/ChangeCorrectionProposal.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/correction/CorrectionCommandHandler.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/correction/MarkerResolutionProposal.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/correction/ProblemLocation.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/correction/RubyCorrectionAssistant.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/typehierarchy/AbstractHierarchyViewerSorter.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/typehierarchy/HierarchyLabelProvider.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/typehierarchy/HistoryListAction.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/typehierarchy/MethodsContentProvider.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/typehierarchy/MethodsLabelProvider.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/typehierarchy/TypeHierarchyContentProvider.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/typehierarchy/TypeHierarchyViewPart.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/util/CoreUtility.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/viewsupport/ProblemMarkerManager.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/viewsupport/RubyUILabelProvider.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/wizards/NewClassCreationWizard.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/wizards/NewElementWizard.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/wizards/OpenRubyProjectWizardToolbarAction.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/wizards/RubyProjectWizard.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/wizards/RubyProjectWizardFirstPage.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/wizards/RubyProjectWizardSecondPage.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/wizards/SuperModuleSelectionDialog.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/wizards/buildpaths/AddSourceFolderWizardPage.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/wizards/buildpaths/CPListElement.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/wizards/buildpaths/CPVariableElementLabelProvider.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/wizards/buildpaths/EditVariableEntryDialog.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/wizards/buildpaths/LibrariesWorkbookPage.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/wizards/buildpaths/LoadpathContainerDefaultPage.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/wizards/buildpaths/LoadpathContainerSelectionPage.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/wizards/buildpaths/LoadpathContainerWizard.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/wizards/buildpaths/LoadpathOrderingWorkbookPage.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/wizards/buildpaths/NewVariableEntryDialog.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/wizards/buildpaths/ProjectsWorkbookPage.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/wizards/buildpaths/SetFilterWizardPage.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/wizards/buildpaths/SourceContainerWorkbookPage.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/wizards/buildpaths/VariablePathDialogField.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/wizards/buildpaths/newsourcepage/DialogPackageExplorer.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/wizards/buildpaths/newsourcepage/DialogPackageExplorerActionGroup.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/wizards/buildpaths/newsourcepage/GenerateBuildPathActionGroup.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/wizards/buildpaths/newsourcepage/LinkFolderDialog.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/wizards/buildpaths/newsourcepage/LoadpathModifierAction.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/wizards/buildpaths/newsourcepage/NewSourceContainerWorkbookPage.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/workingsets/WorkingSetFilterActionGroup.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/OverrideIndicatorLabelDecorator.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/ProblemsLabelDecorator.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/RubyElementImageDescriptor.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/StandardRubyElementContentProvider.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/actions/AbstractOpenWizardAction.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/actions/DeclarationsSearchGroup.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/actions/MemberFilterActionGroup.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/actions/OpenAction.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/actions/OpenCallHierarchyAction.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/actions/OpenEditorActionGroup.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/actions/OpenTypeHierarchyAction.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/actions/OpenViewActionGroup.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/actions/ReadReferencesSearchGroup.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/actions/ReferencesSearchGroup.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/actions/ShowInRubyResourcesViewAction.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/actions/WriteReferencesSearchGroup.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/wizards/RubyCapabilityConfigurationPage.java
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/CalleeMethodWrapper.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/CalleeMethodWrapper.java 2007-08-24 19:32:52 UTC (rev 3077)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/CalleeMethodWrapper.java 2007-08-24 19:35:33 UTC (rev 3078)
@@ -25,7 +25,7 @@
private Comparator fMethodWrapperComparator = new MethodWrapperComparator();
private static class MethodWrapperComparator implements Comparator {
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
*/
public int compare(Object o1, Object o2) {
@@ -64,7 +64,7 @@
return result;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.corext.callhierarchy.MethodWrapper#getTaskName()
*/
protected String getTaskName() {
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/CallerMethodWrapper.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/CallerMethodWrapper.java 2007-08-24 19:32:52 UTC (rev 3077)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/CallerMethodWrapper.java 2007-08-24 19:35:33 UTC (rev 3078)
@@ -45,7 +45,7 @@
return CallHierarchyMessages.CallerMethodWrapper_taskname;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.corext.callhierarchy.MethodWrapper#createMethodWrapper(org.eclipse.jdt.internal.corext.callhierarchy.MethodCall)
*/
protected MethodWrapper createMethodWrapper(MethodCall methodCall) {
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/MethodReferencesSearchRequestor.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/MethodReferencesSearchRequestor.java 2007-08-24 19:32:52 UTC (rev 3077)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/MethodReferencesSearchRequestor.java 2007-08-24 19:35:33 UTC (rev 3078)
@@ -31,7 +31,7 @@
return fSearchResults.getCallers();
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.core.search.SearchRequestor#acceptSearchMatch(org.eclipse.jdt.core.search.SearchMatch)
*/
public void acceptSearchMatch(SearchMatch match) {
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/RubyImplementorFinder.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/RubyImplementorFinder.java 2007-08-24 19:32:52 UTC (rev 3077)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/RubyImplementorFinder.java 2007-08-24 19:35:33 UTC (rev 3078)
@@ -22,7 +22,7 @@
import org.rubypeople.rdt.internal.ui.RubyPlugin;
public class RubyImplementorFinder implements IImplementorFinder {
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.corext.callhierarchy.IImplementorFinder#findImplementingTypes(org.eclipse.jdt.core.IType, org.eclipse.core.runtime.IProgressMonitor)
*/
public Collection findImplementingTypes(IType type, IProgressMonitor progressMonitor) {
@@ -42,7 +42,7 @@
return null;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.corext.callhierarchy.IImplementorFinder#findInterfaces(org.eclipse.jdt.core.IType, org.eclipse.core.runtime.IProgressMonitor)
*/
public Collection findInterfaces(IType type, IProgressMonitor progressMonitor) {
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/util/SuperTypeHierarchyCache.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/util/SuperTypeHierarchyCache.java 2007-08-24 19:32:52 UTC (rev 3077)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/util/SuperTypeHierarchyCache.java 2007-08-24 19:35:33 UTC (rev 3078)
@@ -54,7 +54,7 @@
fTypeHierarchy= null;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see java.lang.Object#toString()
*/
public String toString() {
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/util/TypeFilter.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/util/TypeFilter.java 2007-08-24 19:32:52 UTC (rev 3077)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/util/TypeFilter.java 2007-08-24 19:35:33 UTC (rev 3078)
@@ -97,7 +97,7 @@
return false;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
*/
public synchronized void propertyChange(PropertyChangeEvent event) {
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/actions/NewWizardsActionGroup.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/actions/NewWizardsActionGroup.java 2007-08-24 19:32:52 UTC (rev 3077)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/actions/NewWizardsActionGroup.java 2007-08-24 19:35:33 UTC (rev 3078)
@@ -46,7 +46,7 @@
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* Method declared in ActionGroup
*/
public void fillContextMenu(IMenuManager menu) {
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/actions/WorkbenchRunnableAdapter.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/actions/WorkbenchRunnableAdapter.java 2007-08-24 19:32:52 UTC (rev 3077)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/actions/WorkbenchRunnableAdapter.java 2007-08-24 19:35:33 UTC (rev 3078)
@@ -93,7 +93,7 @@
public void runAsUserJob(String name, final Object jobFamiliy) {
Job buildJob = new Job(name){
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
*/
protected IStatus run(IProgressMonitor monitor) {
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/callhierarchy/CallHierarchyFiltersActionGroup.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/callhierarchy/CallHierarchyFiltersActionGroup.java 2007-08-24 19:32:52 UTC (rev 3077)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/callhierarchy/CallHierarchyFiltersActionGroup.java 2007-08-24 19:35:33 UTC (rev 3078)
@@ -56,7 +56,7 @@
fPart= part;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* Method declared on ActionGroup.
*/
public void fillActionBars(IActionBars actionBars) {
@@ -68,7 +68,7 @@
viewMenu.add(new ShowFilterDialogAction());
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* Method declared on ActionGroup.
*/
public void dispose() {
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/callhierarchy/CallHierarchyLabelDecorator.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/callhierarchy/CallHierarchyLabelDecorator.java 2007-08-24 19:32:52 UTC (rev 3077)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/callhierarchy/CallHierarchyLabelDecorator.java 2007-08-24 19:35:33 UTC (rev 3078)
@@ -35,14 +35,14 @@
// Do nothing
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see ILabelDecorator#decorateText(String, Object)
*/
public String decorateText(String text, Object element) {
return text;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see ILabelDecorator#decorateImage(Image, Object)
*/
public Image decorateImage(Image image, Object element) {
@@ -76,28 +76,28 @@
return methodWrapper.getLevel() > CallHierarchyUI.getDefault().getMaxCallDepth();
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see IBaseLabelProvider#addListener(ILabelProviderListener)
*/
public void addListener(ILabelProviderListener listener) {
// Do nothing
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see IBaseLabelProvider#dispose()
*/
public void dispose() {
// Nothing to dispose
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see IBaseLabelProvider#isLabelProperty(Object, String)
*/
public boolean isLabelProperty(Object element, String property) {
return true;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see IBaseLabelProvider#removeListener(ILabelProviderListener)
*/
public void removeListener(ILabelProviderListener listener) {
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/callhierarchy/FiltersDialog.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/callhierarchy/FiltersDialog.java 2007-08-24 19:32:52 UTC (rev 3077)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/callhierarchy/FiltersDialog.java 2007-08-24 19:35:33 UTC (rev 3078)
@@ -44,7 +44,7 @@
super(parentShell);
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* Method declared on Window.
*/
protected void configureShell(Shell newShell) {
@@ -53,7 +53,7 @@
PlatformUI.getWorkbench().getHelpSystem().setHelp(newShell, IRubyHelpContextIds.CALL_HIERARCHY_FILTERS_DIALOG);
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* Method declared on Dialog.
*/
protected Control createDialogArea(Composite parent) {
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/callhierarchy/HistoryListAction.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/callhierarchy/HistoryListAction.java 2007-08-24 19:32:52 UTC (rev 3077)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/callhierarchy/HistoryListAction.java 2007-08-24 19:35:33 UTC (rev 3078)
@@ -147,7 +147,7 @@
PlatformUI.getWorkbench().getHelpSystem().setHelp(newShell, IRubyHelpContextIds.HISTORY_LIST_DIALOG);
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jface.window.Window#create()
*/
public void create() {
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/callhierarchy/SearchScopeActionGroup.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/callhierarchy/SearchScopeActionGroup.java 2007-08-24 19:32:52 UTC (rev 3077)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/callhierarchy/SearchScopeActionGroup.java 2007-08-24 19:35:33 UTC (rev 3078)
@@ -178,7 +178,7 @@
javaSearchMM.setRemoveAllWhenShown(true);
javaSearchMM.addMenuListener(new IMenuListener() {
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jface.action.IMenuListener#menuAboutToShow(org.eclipse.jface.action.IMenuManager)
*/
public void menuAboutToShow(IMenuManager manager) {
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/callhierarchy/SearchScopeHierarchyAction.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/callhierarchy/SearchScopeHierarchyAction.java 2007-08-24 19:32:52 UTC (rev 3077)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/callhierarchy/SearchScopeHierarchyAction.java 2007-08-24 19:35:33 UTC (rev 3078)
@@ -49,14 +49,14 @@
return null;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.ui.callhierarchy.SearchScopeActionGroup.SearchScopeAction#getSearchScopeType()
*/
public int getSearchScopeType() {
return SearchScopeActionGroup.SEARCH_SCOPE_TYPE_HIERARCHY;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.ui.callhierarchy.SearchScopeAction#getFullDescription()
*/
public String getFullDescription() {
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/callhierarchy/SearchScopeProjectAction.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/callhierarchy/SearchScopeProjectAction.java 2007-08-24 19:32:52 UTC (rev 3077)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/callhierarchy/SearchScopeProjectAction.java 2007-08-24 19:35:33 UTC (rev 3078)
@@ -40,14 +40,14 @@
return factory.createRubyProjectSearchScope(method.getRubyProject(), true);
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.ui.callhierarchy.SearchScopeActionGroup.SearchScopeAction#getSearchScopeType()
*/
public int getSearchScopeType() {
return SearchScopeActionGroup.SEARCH_SCOPE_TYPE_PROJECT;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.ui.callhierarchy.SearchScopeAction#getFullDescription()
*/
public String getFullDescription() {
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/callhierarchy/SearchScopeWorkingSetAction.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/callhierarchy/SearchScopeWorkingSetAction.java 2007-08-24 19:32:52 UTC (rev 3077)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/callhierarchy/SearchScopeWorkingSetAction.java 2007-08-24 19:35:33 UTC (rev 3078)
@@ -42,14 +42,14 @@
return fWorkingSets;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.ui.callhierarchy.SearchScopeActionGroup.SearchScopeAction#getSearchScopeType()
*/
public int getSearchScopeType() {
return SearchScopeActionGroup.SEARCH_SCOPE_TYPE_WORKING_SET;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.ui.callhierarchy.SearchScopeAction#getFullDescription()
*/
public String getFullDescription() {
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/callhierarchy/SearchScopeWorkspaceAction.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/callhierarchy/SearchScopeWorkspaceAction.java 2007-08-24 19:32:52 UTC (rev 3077)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/callhierarchy/SearchScopeWorkspaceAction.java 2007-08-24 19:35:33 UTC (rev 3078)
@@ -31,14 +31,14 @@
return SearchEngine.createWorkspaceScope();
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.ui.callhierarchy.SearchScopeActionGroup.SearchScopeAction#getSearchScopeType()
*/
public int getSearchScopeType() {
return SearchScopeActionGroup.SEARCH_SCOPE_TYPE_WORKSPACE;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.ui.callhierarchy.SearchScopeAction#getFullDescription()
*/
public String getFullDescription() {
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/callhierarchy/SelectWorkingSetAction.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/callhierarchy/SelectWorkingSetAction.java 2007-08-24 19:32:52 UTC (rev 3077)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/callhierarchy/SelectWorkingSetAction.java 2007-08-24 19:35:33 UTC (rev 3078)
@@ -30,7 +30,7 @@
PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IRubyHelpContextIds.CALL_HIERARCHY_SEARCH_SCOPE_ACTION);
}
/*
- * (non-Rubydoc)
+ * (non-Javadoc)
*
* @see org.eclipse.jface.action.Action#run()
*/
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/filters/NamePatternFilter.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/filters/NamePatternFilter.java 2007-08-24 19:32:52 UTC (rev 3077)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/filters/NamePatternFilter.java 2007-08-24 19:35:33 UTC (rev 3078)
@@ -47,7 +47,7 @@
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* Method declared on ViewerFilter.
*/
public boolean select(Viewer viewer, Object parentElement, Object element) {
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/BuildPathsPropertyPage.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/BuildPathsPropertyPage.java 2007-08-24 19:32:52 UTC (rev 3077)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/BuildPathsPropertyPage.java 2007-08-24 19:35:33 UTC (rev 3078)
@@ -111,7 +111,7 @@
return pageSettings;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jface.dialogs.IDialogPage#setVisible(boolean)
*/
public void setVisible(boolean visible) {
@@ -234,7 +234,7 @@
return true;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see IStatusChangeListener#statusChanged
*/
public void statusChanged(IStatus status) {
@@ -242,7 +242,7 @@
StatusUtil.applyToStatusLine(this, status);
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jface.preference.PreferencePage#applyData(java.lang.Object)
*/
public void applyData(Object data) {
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/CodeFormatterPreferencePage.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/CodeFormatterPreferencePage.java 2007-08-24 19:32:52 UTC (rev 3077)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/CodeFormatterPreferencePage.java 2007-08-24 19:35:33 UTC (rev 3078)
@@ -40,7 +40,7 @@
setTitle(PreferencesMessages.CodeFormatterPreferencePage_title);
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
*/
public void createControl(Composite parent) {
@@ -59,21 +59,21 @@
PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IRubyHelpContextIds.CODEFORMATTER_PREFERENCE_PAGE);
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.ui.preferences.PropertyAndPreferencePage#createPreferenceContent(org.eclipse.swt.widgets.Composite)
*/
protected Control createPreferenceContent(Composite composite) {
return fConfigurationBlock.createContents(composite);
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.ui.preferences.PropertyAndPreferencePage#hasProjectSpecificOptions(org.eclipse.core.resources.IProject)
*/
protected boolean hasProjectSpecificOptions(IProject project) {
return fConfigurationBlock.hasProjectSpecificOptions(project);
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.ui.preferences.PropertyAndPreferencePage#enableProjectSpecificSettings(boolean)
*/
protected void enableProjectSpecificSettings(boolean useProjectSpecificSettings) {
@@ -83,21 +83,21 @@
}
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.ui.preferences.PropertyAndPreferencePage#getPreferencePageID()
*/
protected String getPreferencePageID() {
return PREF_ID;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.ui.preferences.PropertyAndPreferencePage#getPropertyPageID()
*/
protected String getPropertyPageID() {
return PROP_ID;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jface.dialogs.DialogPage#dispose()
*/
public void dispose() {
@@ -107,7 +107,7 @@
super.dispose();
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jface.preference.IPreferencePage#performDefaults()
*/
protected void performDefaults() {
@@ -117,7 +117,7 @@
super.performDefaults();
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jface.preference.IPreferencePage#performOk()
*/
public boolean performOk() {
@@ -127,7 +127,7 @@
return super.performOk();
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.ui.preferences.PropertyAndPreferencePage#setElement(org.eclipse.core.runtime.IAdaptable)
*/
public void setElement(IAdaptable element) {
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/KeywordConfigurationBlock.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/KeywordConfigurationBlock.java 2007-08-24 19:32:52 UTC (rev 3077)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/KeywordConfigurationBlock.java 2007-08-24 19:35:33 UTC (rev 3078)
@@ -57,27 +57,27 @@
public KeywordLabelProvider() {
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
*/
public Image getImage(Object element) {
return null; // RubyPluginImages.get(RubyPluginImages.IMG_OBJS_REFACTORING_INFO);
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
*/
public String getText(Object element) {
return getColumnText(element, 0);
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
*/
public Image getColumnImage(Object element, int columnIndex) {
return null;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)
*/
public String getColumnText(Object element, int columnIndex) {
@@ -88,7 +88,7 @@
return ""; //$NON-NLS-1$
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jface.viewers.IFontProvider#getFont(java.lang.Object)
*/
public Font getFont(Object element) {
@@ -252,7 +252,7 @@
return null;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock#updateControls()
*/
protected void updateControls() {
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/KeywordPreferencePage.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/KeywordPreferencePage.java 2007-08-24 19:32:52 UTC (rev 3077)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/KeywordPreferencePage.java 2007-08-24 19:35:33 UTC (rev 3078)
@@ -51,14 +51,14 @@
// }
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.ui.preferences.PropertyAndPreferencePage#createPreferenceContent(org.eclipse.swt.widgets.Composite)
*/
protected Control createPreferenceContent(Composite composite) {
return fConfigurationBlock.createContents(composite);
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.ui.preferences.PropertyAndPreferencePage#hasProjectSpecificOptions(org.eclipse.core.resources.IProject)
*/
protected boolean hasProjectSpecificOptions(IProject project) {
@@ -66,21 +66,21 @@
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.ui.preferences.PropertyAndPreferencePage#getPreferencePageID()
*/
protected String getPreferencePageID() {
return PREF_ID;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.ui.preferences.PropertyAndPreferencePage#getPropertyPageID()
*/
protected String getPropertyPageID() {
return PROP_ID;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.ui.preferences.PropertyAndPreferencePage#enableProjectSpecificSettings(boolean)
*/
protected void enableProjectSpecificSettings(boolean useProjectSpecificSettings) {
@@ -119,7 +119,7 @@
}
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jface.dialogs.DialogPage#dispose()
*/
public void dispose() {
@@ -129,7 +129,7 @@
super.dispose();
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.ui.preferences.PropertyAndPreferencePage#setElement(org.eclipse.core.runtime.IAdaptable)
*/
public void setElement(IAdaptable element) {
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/OptionsConfigurationBlock.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/OptionsConfigurationBlock.java 2007-08-24 19:32:52 UTC (rev 3077)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/OptionsConfigurationBlock.java 2007-08-24 19:35:33 UTC (rev 3078)
@@ -108,7 +108,7 @@
}
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see java.lang.Object#toString()
*/
public String toString() {
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/ProblemSeveritiesConfigurationBlock.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/ProblemSeveritiesConfigurationBlock.java 2007-08-24 19:32:52 UTC (rev 3077)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/ProblemSeveritiesConfigurationBlock.java 2007-08-24 19:35:33 UTC (rev 3078)
@@ -317,7 +317,7 @@
return new String[] { title, message };
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock#dispose()
*/
public void dispose() {
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/ProblemSeveritiesPreferencePage.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/ProblemSeveritiesPreferencePage.java 2007-08-24 19:32:52 UTC (rev 3077)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/ProblemSeveritiesPreferencePage.java 2007-08-24 19:35:33 UTC (rev 3078)
@@ -65,21 +65,21 @@
return fConfigurationBlock.hasProjectSpecificOptions(project);
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.ui.preferences.PropertyAndPreferencePage#getPreferencePageID()
*/
protected String getPreferencePageID() {
return PREF_ID;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.ui.preferences.PropertyAndPreferencePage#getPropertyPageID()
*/
protected String getPropertyPageID() {
return PROP_ID;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jface.dialogs.DialogPage#dispose()
*/
public void dispose() {
@@ -89,7 +89,7 @@
super.dispose();
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.ui.preferences.PropertyAndPreferencePage#enableProjectSpecificSettings(boolean)
*/
protected void enableProjectSpecificSettings(boolean useProjectSpecificSettings) {
@@ -128,7 +128,7 @@
}
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jface.preference.PreferencePage#applyData(java.lang.Object)
*/
public void applyData(Object data) {
@@ -143,7 +143,7 @@
}
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.ui.preferences.PropertyAndPreferencePage#setElement(org.eclipse.core.runtime.IAdaptable)
*/
public void setElement(IAdaptable element) {
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/ProjectSelectionDialog.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/ProjectSelectionDialog.java 2007-08-24 19:32:52 UTC (rev 3077)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/ProjectSelectionDialog.java 2007-08-24 19:35:33 UTC (rev 3078)
@@ -74,7 +74,7 @@
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* Method declared on Dialog.
*/
protected Control createDialogArea(Composite parent) {
@@ -150,7 +150,7 @@
}
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.ui.dialogs.SelectionStatusDialog#computeResult()
*/
protected void computeResult() {
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/PropertyAndPreferencePage.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/PropertyAndPreferencePage.java 2007-08-24 19:32:52 UTC (rev 3077)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/PropertyAndPreferencePage.java 2007-08-24 19:35:33 UTC (rev 3078)
@@ -297,20 +297,20 @@
StatusUtil.applyToStatusLine(this, status);
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
*/
public void init(IWorkbench workbench) {
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.ui.IWorkbenchPropertyPage#getElement()
*/
public IAdaptable getElement() {
return fProject;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.ui.IWorkbenchPropertyPage#setElement(org.eclipse.core.runtime.IAdaptable)
*/
public void setElement(IAdaptable element) {
@@ -318,7 +318,7 @@
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jface.preference.PreferencePage#applyData(java.lang.Object)
*/
public void applyData(Object data) {
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/TodoTaskConfigurationBlock.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/TodoTaskConfigurationBlock.java 2007-08-24 19:32:52 UTC (rev 3077)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/TodoTaskConfigurationBlock.java 2007-08-24 19:35:33 UTC (rev 3078)
@@ -67,27 +67,27 @@
public TodoTaskLabelProvider() {
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
*/
public Image getImage(Object element) {
return null; // RubyPluginImages.get(RubyPluginImages.IMG_OBJS_REFACTORING_INFO);
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
*/
public String getText(Object element) {
return getColumnText(element, 0);
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
*/
public Image getColumnImage(Object element, int columnIndex) {
return null;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)
*/
public String getColumnText(Object element, int columnIndex) {
@@ -110,7 +110,7 @@
}
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jface.viewers.IFontProvider#getFont(java.lang.Object)
*/
public Font getFont(Object element) {
@@ -322,7 +322,7 @@
return new String[] { title, message };
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock#updateControls()
*/
protected void updateControls() {
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/TodoTaskPreferencePage.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/TodoTaskPreferencePage.java 2007-08-24 19:32:52 UTC (rev 3077)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/TodoTaskPreferencePage.java 2007-08-24 19:35:33 UTC (rev 3078)
@@ -53,14 +53,14 @@
}
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.ui.preferences.PropertyAndPreferencePage#createPreferenceContent(org.eclipse.swt.widgets.Composite)
*/
protected Control createPreferenceContent(Composite composite) {
return fConfigurationBlock.createContents(composite);
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.ui.preferences.PropertyAndPreferencePage#hasProjectSpecificOptions(org.eclipse.core.resources.IProject)
*/
protected boolean hasProjectSpecificOptions(IProject project) {
@@ -68,21 +68,21 @@
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.ui.preferences.PropertyAndPreferencePage#getPreferencePageID()
*/
protected String getPreferencePageID() {
return PREF_ID;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.ui.preferences.PropertyAndPreferencePage#getPropertyPageID()
*/
protected String getPropertyPageID() {
return PROP_ID;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.ui.preferences.PropertyAndPreferencePage#enableProjectSpecificSettings(boolean)
*/
protected void enableProjectSpecificSettings(boolean useProjectSpecificSettings) {
@@ -121,7 +121,7 @@
}
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jface.dialogs.DialogPage#dispose()
*/
public void dispose() {
@@ -131,7 +131,7 @@
super.dispose();
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.ui.preferences.PropertyAndPreferencePage#setElement(org.eclipse.core.runtime.IAdaptable)
*/
public void setElement(IAdaptable element) {
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/formatter/IndentationTabPage.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/formatter/IndentationTabPage.java 2007-08-24 19:32:52 UTC (rev 3077)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/formatter/IndentationTabPage.java 2007-08-24 19:35:33 UTC (rev 3078)
@@ -95,7 +95,7 @@
fPreview.setPreviewText(PREVIEW);
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.ui.preferences.formatter.ModifyDialogTabPage#doCreateRubyPreview(org.eclipse.swt.widgets.Composite)
*/
protected RubyPreview doCreateRubyPreview(Composite parent) {
@@ -103,7 +103,7 @@
return fPreview;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.ui.preferences.formatter.ModifyDialogTabPage#doUpdatePreview()
*/
protected void doUpdatePreview() {
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/formatter/ModifyDialog.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/formatter/ModifyDialog.java 2007-08-24 19:32:52 UTC (rev 3077)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/formatter/ModifyDialog.java 2007-08-24 19:35:33 UTC (rev 3078)
@@ -155,7 +155,7 @@
super.updateStatus(status != null ? status : fStandardStatus);
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jface.window.Window#getInitialSize()
*/
protected Point getInitialSize() {
@@ -173,7 +173,7 @@
return initialSize;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jface.window.Window#getInitialLocation(org.eclipse.swt.graphics.Point)
*/
protected Point getInitialLocation(Point initialSize) {
@@ -195,7 +195,7 @@
return super.close();
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jface.dialogs.Dialog#okPressed()
*/
protected void okPressed() {
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/rubyeditor/RubyOutlinePage.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/rubyeditor/RubyOutlinePage.java 2007-08-24 19:32:52 UTC (rev 3077)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/rubyeditor/RubyOutlinePage.java 2007-08-24 19:35:33 UTC (rev 3078)
@@ -883,7 +883,7 @@
return type.exists() ? type : null;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* Method declared on Page
*/
public void init(IPageSite pageSite) {
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/search/FiltersDialog.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/search/FiltersDialog.java 2007-08-24 19:32:52 UTC (rev 3077)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/search/FiltersDialog.java 2007-08-24 19:35:33 UTC (rev 3078)
@@ -74,7 +74,7 @@
}
/*
- * (non-Rubydoc) Method declared on Dialog.
+ * (non-Javadoc) Method declared on Dialog.
*/
protected Control createDialogArea(Composite composite) {
Composite parent = (Composite) super.createDialogArea(composite);
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/search/RubySearchPage.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/search/RubySearchPage.java 2007-08-24 19:32:52 UTC (rev 3077)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/search/RubySearchPage.java 2007-08-24 19:35:33 UTC (rev 3078)
@@ -555,7 +555,7 @@
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jface.dialogs.DialogPage#dispose()
*/
public void dispose() {
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/search/RubySearchResult.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/search/RubySearchResult.java 2007-08-24 19:32:52 UTC (rev 3077)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/search/RubySearchResult.java 2007-08-24 19:35:33 UTC (rev 3078)
@@ -186,7 +186,7 @@
}
}
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.search.ui.ISearchResultCategory#getFile(java.lang.Object)
*/
public IFile getFile(Object element) {
@@ -204,7 +204,7 @@
}
/*
- * (non-Rubydoc)
+ * (non-Javadoc)
*
* @see org.eclipse.search2.ui.text.IStructureProvider#isShownInEditor(org.eclipse.search2.ui.text.Match,
* org.eclipse.ui.IEditorPart)
@@ -220,7 +220,7 @@
return false;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.search.ui.ISearchResult#getQuery()
*/
public ISearchQuery getQuery() {
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/search/RubySearchResultPage.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/search/RubySearchResultPage.java 2007-08-24 19:32:52 UTC (rev 3077)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/search/RubySearchResultPage.java 2007-08-24 19:35:33 UTC (rev 3078)
@@ -104,7 +104,7 @@
return getNewCollator().compare(name1, name2);
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jface.viewers.ViewerSorter#getCollator()
*/
public final java.text.Collator getCollator() {
@@ -465,7 +465,7 @@
return super.getViewer();
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.search.ui.text.AbstractTextSearchViewPage#restoreState(org.eclipse.ui.IMemento)
*/
public void restoreState(IMemento memento) {
@@ -500,7 +500,7 @@
}
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.search.ui.text.AbstractTextSearchViewPage#saveState(org.eclipse.ui.IMemento)
*/
public void saveState(IMemento memento) {
@@ -564,7 +564,7 @@
setFilters(newFilters);
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.search.ui.text.AbstractTextSearchViewPage#handleSearchResultChanged(org.eclipse.search.ui.SearchResultEvent)
*/
protected synchronized void handleSearchResultChanged(SearchResultEvent e) {
@@ -771,7 +771,7 @@
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
*/
public Object getAdapter(Class adapter) {
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/AbstractInformationControl.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/AbstractInformationControl.java 2007-08-24 19:32:52 UTC (rev 3077)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/AbstractInformationControl.java 2007-08-24 19:35:33 UTC (rev 3078)
@@ -92,7 +92,7 @@
public NamePatternFilter() {
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* Method declared on ViewerFilter.
*/
public boolean select(Viewer viewer, Object parentElement, Object element) {
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/correction/CUCorrectionProposal.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/correction/CUCorrectionProposal.java 2007-08-24 19:32:52 UTC (rev 3077)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/correction/CUCorrectionProposal.java 2007-08-24 19:35:33 UTC (rev 3078)
@@ -212,7 +212,7 @@
}
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jface.text.contentassist.ICompletionProposal#apply(org.eclipse.jface.text.IDocument)
*/
public void apply(IDocument document) {
@@ -294,7 +294,7 @@
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.ui.text.correction.ChangeCorrectionProposal#createChange()
*/
protected final Change createChange() throws CoreException {
@@ -330,7 +330,7 @@
return getTextChange().getPreviewContent(new NullProgressMonitor());
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see java.lang.Object#toString()
*/
public String toString() {
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/correction/ChangeCorrectionProposal.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/correction/ChangeCorrectionProposal.java 2007-08-24 19:32:52 UTC (rev 3077)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/correction/ChangeCorrectionProposal.java 2007-08-24 19:35:33 UTC (rev 3078)
@@ -226,7 +226,7 @@
fName= name;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.ui.text.java.IRubyCompletionProposal#getRelevance()
*/
public int getRelevance() {
@@ -241,7 +241,7 @@
fRelevance= relevance;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.ui.text.correction.IShortcutProposal#getProposalId()
*/
public String getCommandId() {
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/correction/CorrectionCommandHandler.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/correction/CorrectionCommandHandler.java 2007-08-24 19:32:52 UTC (rev 3077)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/correction/CorrectionCommandHandler.java 2007-08-24 19:35:33 UTC (rev 3078)
@@ -54,7 +54,7 @@
fIsAssist= isAssist;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
*/
public Object execute(ExecutionEvent event) throws ExecutionException {
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/correction/MarkerResolutionProposal.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/correction/MarkerResolutionProposal.java 2007-08-24 19:32:52 UTC (rev 3077)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/correction/MarkerResolutionProposal.java 2007-08-24 19:35:33 UTC (rev 3078)
@@ -38,14 +38,14 @@
fMarker= marker;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jface.text.contentassist.ICompletionProposal#apply(org.eclipse.jface.text.IDocument)
*/
public void apply(IDocument document) {
fResolution.run(fMarker);
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jface.text.contentassist.ICompletionProposal#getAdditionalProposalInfo()
*/
public String getAdditionalProposalInfo() {
@@ -61,21 +61,21 @@
return null;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jface.text.contentassist.ICompletionProposal#getContextInformation()
*/
public IContextInformation getContextInformation() {
return null;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jface.text.contentassist.ICompletionProposal#getDisplayString()
*/
public String getDisplayString() {
return fResolution.getLabel();
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jface.text.contentassist.ICompletionProposal#getImage()
*/
public Image getImage() {
@@ -85,7 +85,7 @@
return RubyPluginImages.get(RubyPluginImages.IMG_CORRECTION_CHANGE);
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.ui.text.java.IRubyCompletionProposal#getRelevance()
*/
public int getRelevance() {
@@ -95,7 +95,7 @@
return 10;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jface.text.contentassist.ICompletionProposal#getSelection(org.eclipse.jface.text.IDocument)
*/
public Point getSelection(IDocument document) {
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/correction/ProblemLocation.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/correction/ProblemLocation.java 2007-08-24 19:32:52 UTC (rev 3077)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/correction/ProblemLocation.java 2007-08-24 19:35:33 UTC (rev 3078)
@@ -62,14 +62,14 @@
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.ui.text.correction.IProblemLocation#getProblemId()
*/
public int getProblemId() {
return fId;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.ui.text.correction.IProblemLocation#getProblemArguments()
*/
public String[] getProblemArguments() {
@@ -77,28 +77,28 @@
return new String[0];
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.ui.text.correction.IProblemLocation#getLength()
*/
public int getLength() {
return fLength;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.internal.ui.text.correction.IProblemLocation#getOffset()
*/
public int getOffset() {
return fOffset;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.ui.text.java.IProblemLocation#isError()
*/
public boolean isError() {
return fIsError;
}
- /* (non-Rubydoc)
+ /* (non-Javadoc)
* @see org.eclipse.jdt.ui.text.java.IProblemLocation#getMarkerType()
*/
public String getMarkerType() {
@@ -106,7 +106,7 @@
}
/*
- * (non-Rubydoc)
+ * (non-Javadoc)
* @see org.eclipse.jdt.internal.ui.text.correction.IProblemLocation#getCoveringNode(org.eclipse.jdt.core.dom.CompilationUnit)
*/
public Node getCoveringNode(RootNode astRoot) {
@@ -114,7 +114,7 @@
}
/*
- * (non-Rubydoc)
+ * (non-Javadoc)
* @see org.eclipse.jdt.internal.ui.text.correction.IProblemLocation#getCoveredNode(org.eclipse.jdt.core.dom.CompilationUnit)
*/
public Node getCoveredNode(RootNode astRoot) {
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/correction/RubyCorrectionAssistant.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/cor...
[truncated message content] |
|
From: <caw...@us...> - 2007-08-24 19:32:54
|
Revision: 3077
http://rubyeclipse.svn.sourceforge.net/rubyeclipse/?rev=3077&view=rev
Author: cawilliams
Date: 2007-08-24 12:32:52 -0700 (Fri, 24 Aug 2007)
Log Message:
-----------
add OpenViewActionGroup to actions in Call Hierarchy, Type Hierarchy, NavigateActionGroup
Modified Paths:
--------------
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/callhierarchy/CallHierarchyViewPart.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/typehierarchy/TypeHierarchyViewPart.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/actions/NavigateActionGroup.java
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/callhierarchy/CallHierarchyViewPart.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/callhierarchy/CallHierarchyViewPart.java 2007-08-24 19:29:43 UTC (rev 3076)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/callhierarchy/CallHierarchyViewPart.java 2007-08-24 19:32:52 UTC (rev 3077)
@@ -86,6 +86,7 @@
import org.rubypeople.rdt.ui.IContextMenuConstants;
import org.rubypeople.rdt.ui.RubyElementLabels;
import org.rubypeople.rdt.ui.actions.OpenEditorActionGroup;
+import org.rubypeople.rdt.ui.actions.OpenViewActionGroup;
import org.rubypeople.rdt.ui.actions.RubySearchActionGroup;
/**
@@ -836,7 +837,7 @@
};
fActionGroups = new CompositeActionGroup(new ActionGroup[] {
new OpenEditorActionGroup(this),
-// new OpenViewActionGroup(this),
+ new OpenViewActionGroup(this),
// new CCPActionGroup(this),
// new GenerateActionGroup(this),
// new RefactorActionGroup(this),
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/typehierarchy/TypeHierarchyViewPart.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/typehierarchy/TypeHierarchyViewPart.java 2007-08-24 19:29:43 UTC (rev 3076)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/typehierarchy/TypeHierarchyViewPart.java 2007-08-24 19:32:52 UTC (rev 3077)
@@ -116,6 +116,7 @@
import org.rubypeople.rdt.ui.RubyElementLabels;
import org.rubypeople.rdt.ui.RubyUI;
import org.rubypeople.rdt.ui.actions.OpenEditorActionGroup;
+import org.rubypeople.rdt.ui.actions.OpenViewActionGroup;
import org.rubypeople.rdt.ui.actions.RubySearchActionGroup;
/**
@@ -862,7 +863,7 @@
fActionGroups= new CompositeActionGroup(new ActionGroup[] {
new NewWizardsActionGroup(this.getSite()),
new OpenEditorActionGroup(this),
-// new OpenViewActionGroup(this),
+ new OpenViewActionGroup(this),
// new CCPActionGroup(this),
// new GenerateActionGroup(this),
// new RefactorActionGroup(this),
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/actions/NavigateActionGroup.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/actions/NavigateActionGroup.java 2007-08-24 19:29:43 UTC (rev 3076)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/actions/NavigateActionGroup.java 2007-08-24 19:32:52 UTC (rev 3077)
@@ -31,7 +31,7 @@
public class NavigateActionGroup extends ActionGroup {
private OpenEditorActionGroup fOpenEditorActionGroup;
-// private OpenViewActionGroup fOpenViewActionGroup;
+ private OpenViewActionGroup fOpenViewActionGroup;
/**
* Creates a new <code>NavigateActionGroup</code>. The group requires
@@ -42,7 +42,7 @@
*/
public NavigateActionGroup(IViewPart part) {
fOpenEditorActionGroup= new OpenEditorActionGroup(part);
-// fOpenViewActionGroup= new OpenViewActionGroup(part);
+ fOpenViewActionGroup= new OpenViewActionGroup(part);
}
/**
@@ -61,7 +61,7 @@
public void dispose() {
super.dispose();
fOpenEditorActionGroup.dispose();
-// fOpenViewActionGroup.dispose();
+ fOpenViewActionGroup.dispose();
}
/* (non-Javadoc)
@@ -70,7 +70,7 @@
public void fillActionBars(IActionBars actionBars) {
super.fillActionBars(actionBars);
fOpenEditorActionGroup.fillActionBars(actionBars);
-// fOpenViewActionGroup.fillActionBars(actionBars);
+ fOpenViewActionGroup.fillActionBars(actionBars);
}
/* (non-Javadoc)
@@ -80,7 +80,7 @@
super.fillContextMenu(menu);
fOpenEditorActionGroup.fillContextMenu(menu);
-// fOpenViewActionGroup.fillContextMenu(menu);
+ fOpenViewActionGroup.fillContextMenu(menu);
}
/* (non-Javadoc)
@@ -89,7 +89,7 @@
public void setContext(ActionContext context) {
super.setContext(context);
fOpenEditorActionGroup.setContext(context);
-// fOpenViewActionGroup.setContext(context);
+ fOpenViewActionGroup.setContext(context);
}
/* (non-Javadoc)
@@ -98,6 +98,6 @@
public void updateActionBars() {
super.updateActionBars();
fOpenEditorActionGroup.updateActionBars();
-// fOpenViewActionGroup.updateActionBars();
+ fOpenViewActionGroup.updateActionBars();
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <caw...@us...> - 2007-08-24 19:29:45
|
Revision: 3076
http://rubyeclipse.svn.sourceforge.net/rubyeclipse/?rev=3076&view=rev
Author: cawilliams
Date: 2007-08-24 12:29:43 -0700 (Fri, 24 Aug 2007)
Log Message:
-----------
add OpenViewActionGroup to RubyBrowsingPart actions
Modified Paths:
--------------
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/browsing/RubyBrowsingPart.java
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/browsing/RubyBrowsingPart.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/browsing/RubyBrowsingPart.java 2007-08-24 19:23:06 UTC (rev 3075)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/browsing/RubyBrowsingPart.java 2007-08-24 19:29:43 UTC (rev 3076)
@@ -16,6 +16,8 @@
import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.jface.text.ITextSelection;
import org.eclipse.jface.util.Assert;
+import org.eclipse.jface.util.IPropertyChangeListener;
+import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.jface.viewers.IContentProvider;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.IOpenListener;
@@ -44,6 +46,7 @@
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.IWorkbenchPartReference;
import org.eclipse.ui.IWorkbenchPartSite;
+import org.eclipse.ui.IWorkingSetManager;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.actions.ActionContext;
@@ -59,10 +62,12 @@
import org.rubypeople.rdt.core.RubyModelException;
import org.rubypeople.rdt.internal.ui.RubyPlugin;
import org.rubypeople.rdt.internal.ui.actions.CompositeActionGroup;
+import org.rubypeople.rdt.internal.ui.actions.NewWizardsActionGroup;
import org.rubypeople.rdt.internal.ui.viewsupport.AppearanceAwareLabelProvider;
import org.rubypeople.rdt.internal.ui.viewsupport.DecoratingRubyLabelProvider;
import org.rubypeople.rdt.internal.ui.viewsupport.RubyElementImageProvider;
import org.rubypeople.rdt.internal.ui.viewsupport.RubyUILabelProvider;
+import org.rubypeople.rdt.internal.ui.workingsets.WorkingSetFilterActionGroup;
import org.rubypeople.rdt.ui.IWorkingCopyManager;
import org.rubypeople.rdt.ui.PreferenceConstants;
import org.rubypeople.rdt.ui.RubyElementLabelProvider;
@@ -71,9 +76,15 @@
import org.rubypeople.rdt.ui.StandardRubyElementContentProvider;
import org.rubypeople.rdt.ui.actions.CustomFiltersActionGroup;
import org.rubypeople.rdt.ui.actions.OpenEditorActionGroup;
+import org.rubypeople.rdt.ui.actions.OpenViewActionGroup;
+import org.rubypeople.rdt.ui.actions.RubySearchActionGroup;
-public abstract class RubyBrowsingPart extends ViewPart implements
+abstract class RubyBrowsingPart extends ViewPart implements
ISelectionListener {
+
+ private static final String TAG_SELECTED_ELEMENTS= "selectedElements"; //$NON-NLS-1$
+ private static final String TAG_SELECTED_ELEMENT= "selectedElement"; //$NON-NLS-1$
+ private static final String TAG_SELECTED_ELEMENT_PATH= "selectedElementPath"; //$NON-NLS-1$
private StructuredViewer fViewer;
private IMemento fMemento;
@@ -82,7 +93,9 @@
protected Object fPreviousSelectedElement;
private ILabelProvider fTitleProvider;
- // Actions
+// Actions
+ private WorkingSetFilterActionGroup fWorkingSetFilterActionGroup;
+ private boolean fHasWorkingSetFilter= true;
private boolean fHasCustomFilter= true;
private OpenEditorActionGroup fOpenEditorGroup;
protected CompositeActionGroup fActionGroups;
@@ -135,9 +148,8 @@
if (ref != null && ref.getId() == getSite().getId())
fProcessSelectionEvents = false;
}
- };
+ };
-
public RubyBrowsingPart() {
super();
initLinkingEnabled();
@@ -145,9 +157,29 @@
protected void createActions() {
fActionGroups= new CompositeActionGroup(new ActionGroup[] {
- fOpenEditorGroup= new OpenEditorActionGroup(this)
- });
+ new NewWizardsActionGroup(this.getSite()),
+ fOpenEditorGroup= new OpenEditorActionGroup(this),
+ new OpenViewActionGroup(this),
+// fCCPActionGroup= new CCPActionGroup(this),
+// new GenerateActionGroup(this),
+// new RefactorActionGroup(this),
+// new ImportActionGroup(this),
+// fBuildActionGroup= new BuildActionGroup(this),
+ new RubySearchActionGroup(this)});
+
+ if (fHasWorkingSetFilter) {
+ String viewId= getConfigurationElement().getAttribute("id"); //$NON-NLS-1$
+ Assert.isNotNull(viewId);
+ IPropertyChangeListener workingSetListener= new IPropertyChangeListener() {
+ public void propertyChange(PropertyChangeEvent event) {
+ doWorkingSetChanged(event);
+ }
+ };
+ fWorkingSetFilterActionGroup= new WorkingSetFilterActionGroup(getSite(), workingSetListener);
+ fViewer.addFilter(fWorkingSetFilterActionGroup.getWorkingSetFilter());
+ }
+
// Custom filter group
if (fHasCustomFilter)
fCustomFiltersActionGroup= new CustomFiltersActionGroup(this, fViewer);
@@ -155,6 +187,19 @@
fToggleLinkingAction= new ToggleLinkingAction(this);
}
+ private void doWorkingSetChanged(PropertyChangeEvent event) {
+ String property= event.getProperty();
+ if (IWorkingSetManager.CHANGE_WORKING_SET_NAME_CHANGE.equals(property))
+ updateTitle();
+ else if (IWorkingSetManager.CHANGE_WORKING_SET_CONTENT_CHANGE.equals(property)) {
+ updateTitle();
+ fViewer.getControl().setRedraw(false);
+ fViewer.refresh();
+ fViewer.getControl().setRedraw(true);
+ }
+
+ }
+
/**
* Adds additional listeners to this view.
* This method can be overridden but should
@@ -259,9 +304,22 @@
}
}
+ private void saveSelectionState(IMemento memento) {
+ Object elements[]= ((IStructuredSelection) fViewer.getSelection()).toArray();
+ if (elements.length > 0) {
+ IMemento selectionMem= memento.createChild(TAG_SELECTED_ELEMENTS);
+ for (int i= 0; i < elements.length; i++) {
+ IMemento elementMem= selectionMem.createChild(TAG_SELECTED_ELEMENT);
+ Object o= elements[i];
+ if (o instanceof IRubyElement)
+ elementMem.putString(TAG_SELECTED_ELEMENT_PATH, ((IRubyElement) elements[i]).getHandleIdentifier());
+ }
+ }
+ }
+
protected void restoreState(IMemento memento) {
-// if (fHasWorkingSetFilter)
-// fWorkingSetFilterActionGroup.restoreState(memento);
+ if (fHasWorkingSetFilter)
+ fWorkingSetFilterActionGroup.restoreState(memento);
if (fHasCustomFilter)
fCustomFiltersActionGroup.restoreState(memento);
@@ -282,8 +340,8 @@
fillToolBar(toolBar);
-// if (fHasWorkingSetFilter)
-// fWorkingSetFilterActionGroup.fillActionBars(getViewSite().getActionBars());
+ if (fHasWorkingSetFilter)
+ fWorkingSetFilterActionGroup.fillActionBars(getViewSite().getActionBars());
actionBars.updateActionBars();
@@ -296,6 +354,10 @@
menu.add(fToggleLinkingAction);
}
+ protected boolean hasWorkingSetFilter() {
+ return fHasWorkingSetFilter;
+ }
+
protected void fillToolBar(IToolBarManager tbm) {
}
@@ -861,14 +923,18 @@
memento.putMemento(fMemento);
return;
}
-// if (fHasWorkingSetFilter)
-// fWorkingSetFilterActionGroup.saveState(memento);
+ if (fHasWorkingSetFilter)
+ fWorkingSetFilterActionGroup.saveState(memento);
if (fHasCustomFilter)
fCustomFiltersActionGroup.saveState(memento);
-// saveSelectionState(memento);
+ saveSelectionState(memento);
saveLinkingEnabled(memento);
}
+ void setHasWorkingSetFilter(boolean state) {
+ fHasWorkingSetFilter= state;
+ }
+
private void saveLinkingEnabled(IMemento memento) {
memento.putInteger(getLinkToEditorKey(), fLinkingEnabled ? 1 : 0);
}
@@ -931,6 +997,14 @@
}
}
+ protected final ILabelProvider getLabelProvider() {
+ return fLabelProvider;
+ }
+
+ protected final ILabelProvider getTitleProvider() {
+ return fTitleProvider;
+ }
+
/**
* Returns the preference key for the link to editor setting.
*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <caw...@us...> - 2007-08-24 19:23:08
|
Revision: 3075
http://rubyeclipse.svn.sourceforge.net/rubyeclipse/?rev=3075&view=rev
Author: cawilliams
Date: 2007-08-24 12:23:06 -0700 (Fri, 24 Aug 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/CalleeAnalyzerVisitor.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/CalleeMethodWrapper.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/MethodReferencesSearchRequestor.java
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/CalleeAnalyzerVisitor.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/CalleeAnalyzerVisitor.java 2007-08-24 18:03:43 UTC (rev 3074)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/CalleeAnalyzerVisitor.java 2007-08-24 19:23:06 UTC (rev 3075)
@@ -3,8 +3,13 @@
import java.util.Map;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.OperationCanceledException;
import org.jruby.ast.CallNode;
+import org.jruby.ast.ClassNode;
+import org.jruby.ast.DefnNode;
+import org.jruby.ast.DefsNode;
import org.jruby.ast.FCallNode;
+import org.jruby.ast.ModuleNode;
import org.jruby.ast.Node;
import org.jruby.ast.VCallNode;
import org.jruby.evaluator.Instruction;
@@ -26,12 +31,10 @@
private IProgressMonitor fProgressMonitor;
private int fMethodStartPosition;
private int fMethodEndPosition;
- private Node fCompilationUnit;
- public CalleeAnalyzerVisitor(IMethod method, Node cu, IProgressMonitor progressMonitor) {
+ public CalleeAnalyzerVisitor(IMethod method, IProgressMonitor progressMonitor) {
fSearchResults = new CallSearchResultCollector();
this.fMethod = method;
- this.fCompilationUnit= cu;
this.fProgressMonitor = progressMonitor;
try {
@@ -115,5 +118,38 @@
return true;
}
+
+ @Override
+ public Instruction visitDefnNode(DefnNode iVisited) {
+ progressMonitorWorked(1);
+ return super.visitDefnNode(iVisited);
+ }
+
+ @Override
+ public Instruction visitDefsNode(DefsNode iVisited) {
+ progressMonitorWorked(1);
+ return super.visitDefsNode(iVisited);
+ }
+
+ @Override
+ public Instruction visitClassNode(ClassNode iVisited) {
+ progressMonitorWorked(1);
+ return super.visitClassNode(iVisited);
+ }
+
+ @Override
+ public Instruction visitModuleNode(ModuleNode iVisited) {
+ progressMonitorWorked(1);
+ return super.visitModuleNode(iVisited);
+ }
+
+ private void progressMonitorWorked(int work) {
+ if (fProgressMonitor != null) {
+ fProgressMonitor.worked(work);
+ if (fProgressMonitor.isCanceled()) {
+ throw new OperationCanceledException();
+ }
+ }
+ }
}
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/CalleeMethodWrapper.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/CalleeMethodWrapper.java 2007-08-24 18:03:43 UTC (rev 3074)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/CalleeMethodWrapper.java 2007-08-24 19:23:06 UTC (rev 3075)
@@ -90,8 +90,7 @@
}
if (cu != null) {
- CalleeAnalyzerVisitor visitor = new CalleeAnalyzerVisitor((IMethod) getMember(),
- cu, progressMonitor);
+ CalleeAnalyzerVisitor visitor = new CalleeAnalyzerVisitor((IMethod) getMember(), progressMonitor);
cu.accept(visitor);
return visitor.getCallees();
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/MethodReferencesSearchRequestor.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/MethodReferencesSearchRequestor.java 2007-08-24 18:03:43 UTC (rev 3074)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/MethodReferencesSearchRequestor.java 2007-08-24 19:23:06 UTC (rev 3075)
@@ -20,8 +20,9 @@
class MethodReferencesSearchRequestor extends SearchRequestor {
private CallSearchResultCollector fSearchResults;
- private boolean fRequireExactMatch = true;
-
+ private boolean fRequireExactMatch = false;
+// FIXME I turned off the check for exact match, because our SearchEngine doesn't yet properly classify accuracy!
+
MethodReferencesSearchRequestor() {
fSearchResults = new CallSearchResultCollector();
}
@@ -34,9 +35,9 @@
* @see org.eclipse.jdt.core.search.SearchRequestor#acceptSearchMatch(org.eclipse.jdt.core.search.SearchMatch)
*/
public void acceptSearchMatch(SearchMatch match) {
-// if (fRequireExactMatch && (match.getAccuracy() != SearchMatch.A_ACCURATE)) { // FIXME I turned off the check for exact match, because our SearchEngine doesn't yet properly classify accuracy!
-// return;
-// }
+ if (fRequireExactMatch && (match.getAccuracy() != SearchMatch.A_ACCURATE)) {
+ return;
+ }
if (match.isInsideDocComment()) {
return;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <caw...@us...> - 2007-08-24 18:03:50
|
Revision: 3074
http://rubyeclipse.svn.sourceforge.net/rubyeclipse/?rev=3074&view=rev
Author: cawilliams
Date: 2007-08-24 11:03:43 -0700 (Fri, 24 Aug 2007)
Log Message:
-----------
implement otehr half of Call Hierarchy view - find all callers of a method (previous version only would trace paths out of a method, not paths into)
Modified Paths:
--------------
trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/core/IType.java
trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyType.java
Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/core/IType.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/core/IType.java 2007-08-24 18:03:37 UTC (rev 3073)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/core/IType.java 2007-08-24 18:03:43 UTC (rev 3074)
@@ -231,4 +231,6 @@
*/
ITypeHierarchy newTypeHierarchy(WorkingCopyOwner owner, IProgressMonitor monitor) throws RubyModelException;
+ public IMethod[] findMethods(IMethod method);
+
}
\ No newline at end of file
Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyType.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyType.java 2007-08-24 18:03:37 UTC (rev 3073)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyType.java 2007-08-24 18:03:43 UTC (rev 3074)
@@ -25,6 +25,7 @@
package org.rubypeople.rdt.internal.core;
import java.util.ArrayList;
+import java.util.List;
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -36,6 +37,7 @@
import org.rubypeople.rdt.core.ISourceFolder;
import org.rubypeople.rdt.core.IType;
import org.rubypeople.rdt.core.ITypeHierarchy;
+import org.rubypeople.rdt.core.RubyCore;
import org.rubypeople.rdt.core.RubyModelException;
import org.rubypeople.rdt.core.WorkingCopyOwner;
import org.rubypeople.rdt.core.search.SearchEngine;
@@ -362,4 +364,21 @@
return op.getResult();
}
+ public IMethod[] findMethods(IMethod method) {
+ List<IMethod> filtered = new ArrayList<IMethod>();
+ try {
+ ArrayList<IRubyElement> list = getChildrenOfType(METHOD);
+ for (IRubyElement element : list) {
+ IMethod other = (IMethod) element;
+ if (!other.getElementName().equals(method.getElementName())) continue;
+ filtered.add(other);
+ }
+ } catch (RubyModelException e) {
+ RubyCore.log(e);
+ }
+ IMethod[] array = new IMethod[filtered.size()];
+ filtered.toArray(array);
+ return array;
+ }
+
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <caw...@us...> - 2007-08-24 18:03:39
|
Revision: 3073
http://rubyeclipse.svn.sourceforge.net/rubyeclipse/?rev=3073&view=rev
Author: cawilliams
Date: 2007-08-24 11:03:37 -0700 (Fri, 24 Aug 2007)
Log Message:
-----------
implement otehr half of Call Hierarchy view - find all callers of a method (previous version only would trace paths out of a method, not paths into)
Modified Paths:
--------------
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/CallHierarchy.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/MethodReferencesSearchRequestor.java
Added Paths:
-----------
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/IImplementorFinder.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/Implementors.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/RubyImplementorFinder.java
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/CallHierarchy.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/CallHierarchy.java 2007-08-24 17:05:15 UTC (rev 3072)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/CallHierarchy.java 2007-08-24 18:03:37 UTC (rev 3073)
@@ -12,14 +12,17 @@
package org.rubypeople.rdt.internal.corext.callhierarchy;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.StringTokenizer;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.preference.IPreferenceStore;
import org.jruby.ast.Node;
import org.rubypeople.rdt.core.IMember;
import org.rubypeople.rdt.core.IMethod;
+import org.rubypeople.rdt.core.IRubyElement;
import org.rubypeople.rdt.core.IRubyScript;
import org.rubypeople.rdt.core.search.IRubySearchScope;
import org.rubypeople.rdt.core.search.SearchEngine;
@@ -58,32 +61,30 @@
}
public Collection getImplementingMethods(IMethod method) {
-// FIXME Implement this!
-// if (isSearchUsingImplementorsEnabled()) {
-// IRubyElement[] result = Implementors.getInstance().searchForImplementors(new IRubyElement[] {
-// method
-// }, new NullProgressMonitor());
-//
-// if ((result != null) && (result.length > 0)) {
-// return Arrays.asList(result);
-// }
-// }
+ if (isSearchUsingImplementorsEnabled()) {
+ IRubyElement[] result = Implementors.getInstance().searchForImplementors(new IRubyElement[] {
+ method
+ }, new NullProgressMonitor());
+ if ((result != null) && (result.length > 0)) {
+ return Arrays.asList(result);
+ }
+ }
+
return new ArrayList(0);
}
public Collection getInterfaceMethods(IMethod method) {
- // FIXME Implement this!
-// if (isSearchUsingImplementorsEnabled()) {
-// IRubyElement[] result = Implementors.getInstance().searchForInterfaces(new IRubyElement[] {
-// method
-// }, new NullProgressMonitor());
-//
-// if ((result != null) && (result.length > 0)) {
-// return Arrays.asList(result);
-// }
-// }
+ if (isSearchUsingImplementorsEnabled()) {
+ IRubyElement[] result = Implementors.getInstance().searchForInterfaces(new IRubyElement[] {
+ method
+ }, new NullProgressMonitor());
+ if ((result != null) && (result.length > 0)) {
+ return Arrays.asList(result);
+ }
+ }
+
return new ArrayList(0);
}
Added: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/IImplementorFinder.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/IImplementorFinder.java (rev 0)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/IImplementorFinder.java 2007-08-24 18:03:37 UTC (rev 3073)
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Jesper Kamstrup Linnet (ec...@ka...) - initial API and implementation
+ * (report 36180: Callers/Callees view)
+ *******************************************************************************/
+package org.rubypeople.rdt.internal.corext.callhierarchy;
+
+import java.util.Collection;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.rubypeople.rdt.core.IType;
+
+public interface IImplementorFinder {
+
+ /**
+ * Find implementors of the specified IType instance.
+ */
+ public abstract Collection findImplementingTypes(IType type,
+ IProgressMonitor progressMonitor);
+
+ /**
+ * Find interfaces which are implemented by the specified IType instance.
+ */
+ public abstract Collection findInterfaces(IType type, IProgressMonitor progressMonitor);
+}
Property changes on: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/IImplementorFinder.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/Implementors.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/Implementors.java (rev 0)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/Implementors.java 2007-08-24 18:03:37 UTC (rev 3073)
@@ -0,0 +1,188 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Jesper Kamstrup Linnet (ec...@ka...) - initial API and implementation
+ * (report 36180: Callers/Callees view)
+ *******************************************************************************/
+package org.rubypeople.rdt.internal.corext.callhierarchy;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.SubProgressMonitor;
+import org.rubypeople.rdt.core.IMember;
+import org.rubypeople.rdt.core.IMethod;
+import org.rubypeople.rdt.core.IRubyElement;
+import org.rubypeople.rdt.core.IType;
+import org.rubypeople.rdt.core.RubyModelException;
+import org.rubypeople.rdt.internal.ui.RubyPlugin;
+
+/**
+ * The main plugin class to be used in the desktop.
+ */
+public class Implementors {
+ private static IImplementorFinder[] IMPLEMENTOR_FINDERS= new IImplementorFinder[] { new RubyImplementorFinder() };
+ private static Implementors fgInstance;
+
+ /**
+ * Returns the shared instance.
+ */
+ public static Implementors getInstance() {
+ if (fgInstance == null) {
+ fgInstance = new Implementors();
+ }
+
+ return fgInstance;
+ }
+
+ /**
+ * Searches for implementors of the specified Ruby elements. Currently, only IMethod
+ * instances are searched for. Also, only the first element of the elements
+ * parameter is taken into consideration.
+ *
+ * @param elements
+ *
+ * @return An array of found implementing Ruby elements (currently only IMethod
+ * instances)
+ */
+ public IRubyElement[] searchForImplementors(IRubyElement[] elements,
+ IProgressMonitor progressMonitor) {
+ if ((elements != null) && (elements.length > 0)) {
+ IRubyElement element = elements[0];
+ if (element instanceof IMember) {
+ IMember member = (IMember) element;
+ IType type = member.getDeclaringType();
+ if (type.isModule()) {
+ IType[] implementingTypes = findImplementingTypes(type,
+ progressMonitor);
+
+ if (member.getElementType() == IRubyElement.METHOD) {
+ return findMethods((IMethod) member, implementingTypes,
+ progressMonitor);
+ } else {
+ return implementingTypes;
+ }
+ }
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Searches for interfaces which are implemented by the declaring classes of
+ * the specified Ruby elements. Currently, only IMethod instances are
+ * searched for. Also, only the first element of the elements parameter is
+ * taken into consideration.
+ *
+ * @param elements
+ *
+ * @return An array of found interfaces implemented by the declaring classes
+ * of the specified Ruby elements (currently only IMethod instances)
+ */
+ public IRubyElement[] searchForInterfaces(IRubyElement[] elements,
+ IProgressMonitor progressMonitor) {
+ if ((elements != null) && (elements.length > 0)) {
+ IRubyElement element = elements[0];
+
+ if (element instanceof IMember) {
+ IMember member = (IMember) element;
+ IType type = member.getDeclaringType();
+
+ IType[] implementingTypes = findInterfaces(type, progressMonitor);
+
+ if (!progressMonitor.isCanceled()) {
+ if (member.getElementType() == IRubyElement.METHOD) {
+ return findMethods((IMethod)member, implementingTypes, progressMonitor);
+ } else {
+ return implementingTypes;
+ }
+ }
+ }
+ }
+
+ return null;
+ }
+
+ private IImplementorFinder[] getImplementorFinders() {
+ return IMPLEMENTOR_FINDERS;
+ }
+
+ private IType[] findImplementingTypes(IType type, IProgressMonitor progressMonitor) {
+ Collection implementingTypes = new ArrayList();
+
+ IImplementorFinder[] finders = getImplementorFinders();
+
+ for (int i = 0; (i < finders.length) && !progressMonitor.isCanceled(); i++) {
+ Collection types = finders[i].findImplementingTypes(type,
+ new SubProgressMonitor(progressMonitor, 10,
+ SubProgressMonitor.SUPPRESS_SUBTASK_LABEL));
+
+ if (types != null) {
+ implementingTypes.addAll(types);
+ }
+ }
+
+ return (IType[]) implementingTypes.toArray(new IType[implementingTypes.size()]);
+ }
+
+ private IType[] findInterfaces(IType type, IProgressMonitor progressMonitor) {
+ Collection interfaces = new ArrayList();
+
+ IImplementorFinder[] finders = getImplementorFinders();
+
+ for (int i = 0; (i < finders.length) && !progressMonitor.isCanceled(); i++) {
+ Collection types = finders[i].findInterfaces(type,
+ new SubProgressMonitor(progressMonitor, 10,
+ SubProgressMonitor.SUPPRESS_SUBTASK_LABEL));
+
+ if (types != null) {
+ interfaces.addAll(types);
+ }
+ }
+
+ return (IType[]) interfaces.toArray(new IType[interfaces.size()]);
+ }
+
+ /**
+ * Finds IMethod instances on the specified IType instances with identical signatures
+ * as the specified IMethod parameter.
+ *
+ * @param method The method to find "equals" of.
+ * @param types The types in which the search is performed.
+ *
+ * @return An array of methods which match the method parameter.
+ */
+ private IRubyElement[] findMethods(IMethod method, IType[] types,
+ IProgressMonitor progressMonitor) {
+ Collection foundMethods = new ArrayList();
+
+ SubProgressMonitor subProgressMonitor = new SubProgressMonitor(progressMonitor,
+ 10, SubProgressMonitor.SUPPRESS_SUBTASK_LABEL);
+ subProgressMonitor.beginTask("", types.length); //$NON-NLS-1$
+
+ try {
+ for (int i = 0; i < types.length; i++) {
+ IType type = types[i];
+ IMethod[] methods = type.findMethods(method);
+
+ if (methods != null) {
+ for (int j = 0; j < methods.length; j++) {
+ foundMethods.add(methods[j]);
+ }
+ }
+
+ subProgressMonitor.worked(1);
+ }
+ } finally {
+ subProgressMonitor.done();
+ }
+
+ return (IRubyElement[]) foundMethods.toArray(new IRubyElement[foundMethods.size()]);
+ }
+}
Property changes on: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/Implementors.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/MethodReferencesSearchRequestor.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/MethodReferencesSearchRequestor.java 2007-08-24 17:05:15 UTC (rev 3072)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/MethodReferencesSearchRequestor.java 2007-08-24 18:03:37 UTC (rev 3073)
@@ -34,9 +34,9 @@
* @see org.eclipse.jdt.core.search.SearchRequestor#acceptSearchMatch(org.eclipse.jdt.core.search.SearchMatch)
*/
public void acceptSearchMatch(SearchMatch match) {
- if (fRequireExactMatch && (match.getAccuracy() != SearchMatch.A_ACCURATE)) {
- return;
- }
+// if (fRequireExactMatch && (match.getAccuracy() != SearchMatch.A_ACCURATE)) { // FIXME I turned off the check for exact match, because our SearchEngine doesn't yet properly classify accuracy!
+// return;
+// }
if (match.isInsideDocComment()) {
return;
Added: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/RubyImplementorFinder.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/RubyImplementorFinder.java (rev 0)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/RubyImplementorFinder.java 2007-08-24 18:03:37 UTC (rev 3073)
@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Jesper Kamstrup Linnet (ec...@ka...) - initial API and implementation
+ * (report 36180: Callers/Callees view)
+ *******************************************************************************/
+package org.rubypeople.rdt.internal.corext.callhierarchy;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.rubypeople.rdt.core.IType;
+import org.rubypeople.rdt.core.ITypeHierarchy;
+import org.rubypeople.rdt.core.RubyModelException;
+import org.rubypeople.rdt.internal.ui.RubyPlugin;
+
+public class RubyImplementorFinder implements IImplementorFinder {
+ /* (non-Rubydoc)
+ * @see org.eclipse.jdt.internal.corext.callhierarchy.IImplementorFinder#findImplementingTypes(org.eclipse.jdt.core.IType, org.eclipse.core.runtime.IProgressMonitor)
+ */
+ public Collection findImplementingTypes(IType type, IProgressMonitor progressMonitor) {
+ ITypeHierarchy typeHierarchy;
+
+ try {
+ typeHierarchy = type.newTypeHierarchy(progressMonitor);
+
+ IType[] implementingTypes = typeHierarchy.getAllClasses();
+ HashSet result = new HashSet(Arrays.asList(implementingTypes));
+
+ return result;
+ } catch (RubyModelException e) {
+ RubyPlugin.log(e);
+ }
+
+ return null;
+ }
+
+ /* (non-Rubydoc)
+ * @see org.eclipse.jdt.internal.corext.callhierarchy.IImplementorFinder#findInterfaces(org.eclipse.jdt.core.IType, org.eclipse.core.runtime.IProgressMonitor)
+ */
+ public Collection findInterfaces(IType type, IProgressMonitor progressMonitor) {
+ ITypeHierarchy typeHierarchy;
+
+ try {
+ typeHierarchy = type.newSupertypeHierarchy(progressMonitor);
+
+ IType[] interfaces = typeHierarchy.getAllSuperModules(type);
+ HashSet result = new HashSet(Arrays.asList(interfaces));
+
+ return result;
+ } catch (RubyModelException e) {
+ RubyPlugin.log(e);
+ }
+
+ return null;
+ }
+}
Property changes on: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/callhierarchy/RubyImplementorFinder.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
