Menu
▾
▴
[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2054] trunk
|
From: <mir...@us...> - 2007-02-28 13:16:59
|
Revision: 2054
http://svn.sourceforge.net/rubyeclipse/?rev=2054&view=rev
Author: mirkostocker
Date: 2007-02-28 05:16:56 -0800 (Wed, 28 Feb 2007)
Log Message:
-----------
fixd a lot of warnings, we are now almost < 100 for the whole project.
Modified Paths:
--------------
trunk/org.epic.regexp/src/org/epic/regexp/views/RegExpView.java
trunk/org.kxml2/build.properties
trunk/org.kxml2/src/org/kxml2/io/KXmlParser.java
trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/codeassist/CompletionEngine.java
trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/codeassist/RubyElementRequestor.java
trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/ExternalRubyScript.java
trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyModelManager.java
trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyScriptProblemFinder.java
trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyScriptStructureBuilder.java
trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/ti/TypeInferenceVisitor.java
trunk/org.rubypeople.rdt.core.tests/src/RubyParserCmd.java
trunk/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/TC_MassIndexUpdater.java
trunk/org.rubypeople.rdt.debug.core.tests/src/org/rubypeople/rdt/debug/core/tests/FTC_ClassicDebuggerCommunicationTest.java
trunk/org.rubypeople.rdt.debug.core.tests/src/org/rubypeople/rdt/debug/core/tests/FTC_RubyDebugCommunicationTest.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/LaunchingPlugin.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/StandardVMRunner.java
trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/StandardVMType.java
trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/AbstractRubyLaunchConfigurationDelegate.java
trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/AbstractVMInstallType.java
trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/RubyLaunchDelegate.java
trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/RubyRuntime.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/extractmethod/ExtractedMethodHelper.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/documentprovider/WorkspaceDocumentProvider.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/nodewrapper/SClassNodeWrapper.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/ExtractMethodPage.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/util/NameHelper.java
trunk/org.rubypeople.rdt.testunit/src/org/rubypeople/rdt/testunit/launcher/TestUnitLaunchShortcut.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/infoviews/RIView.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/PreferenceConstants.java
Modified: trunk/org.epic.regexp/src/org/epic/regexp/views/RegExpView.java
===================================================================
--- trunk/org.epic.regexp/src/org/epic/regexp/views/RegExpView.java 2007-02-28 11:57:16 UTC (rev 2053)
+++ trunk/org.epic.regexp/src/org/epic/regexp/views/RegExpView.java 2007-02-28 13:16:56 UTC (rev 2054)
@@ -494,8 +494,6 @@
REMatch[] matches = re.getAllMatches(matchText.getText());
- String matchesString = "";
-
result = matches.length > 0 ? true : false;
// Reset style
Modified: trunk/org.kxml2/build.properties
===================================================================
--- trunk/org.kxml2/build.properties 2007-02-28 11:57:16 UTC (rev 2053)
+++ trunk/org.kxml2/build.properties 2007-02-28 13:16:56 UTC (rev 2054)
@@ -2,5 +2,4 @@
kxml2.jar
plugin = org.kxml2
plugin.name = kxml2
-plugin.classpath =
source.kxml2.jar = src/
\ No newline at end of file
Modified: trunk/org.kxml2/src/org/kxml2/io/KXmlParser.java
===================================================================
--- trunk/org.kxml2/src/org/kxml2/io/KXmlParser.java 2007-02-28 11:57:16 UTC (rev 2053)
+++ trunk/org.kxml2/src/org/kxml2/io/KXmlParser.java 2007-02-28 13:16:56 UTC (rev 2054)
@@ -72,7 +72,6 @@
// Event-related
private int type;
- private String text;
private boolean isWhitespace;
private String namespace;
private String prefix;
@@ -252,7 +251,6 @@
prefix = null;
name = null;
namespace = null;
- text = null;
type = peekType();
Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/codeassist/CompletionEngine.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/codeassist/CompletionEngine.java 2007-02-28 11:57:16 UTC (rev 2053)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/codeassist/CompletionEngine.java 2007-02-28 13:16:56 UTC (rev 2054)
@@ -2,7 +2,6 @@
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -26,7 +25,6 @@
import org.jruby.ast.MethodDefNode;
import org.jruby.ast.ModuleNode;
import org.jruby.ast.Node;
-import org.jruby.ast.types.INameNode;
import org.jruby.lexer.yacc.SyntaxException;
import org.jruby.parser.StaticScope;
import org.rubypeople.rdt.core.CompletionProposal;
@@ -532,11 +530,7 @@
}
public String getElementName() {
- // TODO Auto-generated method stub
- if (node instanceof INameNode) {
- return ((INameNode)node).getName();
- }
- return null;
+ return node.getName();
}
public int getElementType() {
Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/codeassist/RubyElementRequestor.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/codeassist/RubyElementRequestor.java 2007-02-28 11:57:16 UTC (rev 2053)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/codeassist/RubyElementRequestor.java 2007-02-28 13:16:56 UTC (rev 2054)
@@ -53,7 +53,7 @@
} catch (RubyModelException e) {
RubyCore.log(e);
}
- return (IType[]) types.toArray(new IType[types.size()]);
+ return types.toArray(new IType[types.size()]);
}
private List<IType> filterToMatches(String typeName, List<IType> types) {
@@ -100,7 +100,7 @@
}
if (tokens.isEmpty()) return new ArrayList<IType>();
String name = tokens.remove(tokens.size() - 1) + RUBY_FILE_EXTENSION;
- String[] pckgs = (String[]) tokens.toArray(new String[tokens.size()]);
+ String[] pckgs = tokens.toArray(new String[tokens.size()]);
ISourceFolder folder = root.getSourceFolder(pckgs);
if (!folder.exists()) return new ArrayList<IType>();
IRubyScript otherScript = folder.getRubyScript(name);
Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/ExternalRubyScript.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/ExternalRubyScript.java 2007-02-28 11:57:16 UTC (rev 2053)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/ExternalRubyScript.java 2007-02-28 13:16:56 UTC (rev 2054)
@@ -8,7 +8,6 @@
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
import org.jruby.ast.Node;
import org.jruby.lexer.yacc.SyntaxException;
import org.rubypeople.rdt.core.IBuffer;
Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyModelManager.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyModelManager.java 2007-02-28 11:57:16 UTC (rev 2053)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyModelManager.java 2007-02-28 13:16:56 UTC (rev 2054)
@@ -780,9 +780,9 @@
Platform.getContentTypeManager().addContentTypeChangeListener(this);
// retrieve variable values
- long start = -1;
- if (VERBOSE)
- start = System.currentTimeMillis();
+// long start = -1;
+// if (VERBOSE)
+// start = System.currentTimeMillis();
loadVariablesAndContainers();
// if (VERBOSE)
// traceVariableAndContainers("Loaded", start); //$NON-NLS-1$
@@ -981,7 +981,7 @@
Iterator projectIterator = this.containers.keySet().iterator();
while (projectIterator.hasNext()){
IRubyProject project = (IRubyProject)projectIterator.next();
- Map projectContainers = (Map)this.containers.get(project);
+ Map projectContainers = this.containers.get(project);
if (projectContainers != null){
Iterator containerIterator = projectContainers.keySet().iterator();
while (containerIterator.hasNext()){
@@ -1115,7 +1115,7 @@
public void saving(ISaveContext context) throws CoreException {
// save variable and container values on snapshot/full save
- long start = -1;
+// long start = -1;
// if (VERBOSE)
// start = System.currentTimeMillis();
saveVariablesAndContainers();
@@ -2553,7 +2553,7 @@
saveString(project.getElementName());
- Map containerMap = (Map) RubyModelManager.this.containers.get(project);
+ Map containerMap = RubyModelManager.this.containers.get(project);
if (containerMap == null) {
containerMap = Collections.EMPTY_MAP;
Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyScriptProblemFinder.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyScriptProblemFinder.java 2007-02-28 11:57:16 UTC (rev 2053)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyScriptProblemFinder.java 2007-02-28 13:16:56 UTC (rev 2054)
@@ -16,8 +16,6 @@
import org.rubypeople.rdt.core.IProblemRequestor;
import org.rubypeople.rdt.core.RubyModelException;
import org.rubypeople.rdt.core.parser.IProblem;
-import org.rubypeople.rdt.internal.core.builder.ProblemRequestorMarkerManager;
-import org.rubypeople.rdt.internal.core.parser.Error;
import org.rubypeople.rdt.internal.core.parser.RdtWarnings;
import org.rubypeople.rdt.internal.core.parser.RubyParser;
import org.rubypeople.rdt.internal.core.parser.TaskParser;
Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyScriptStructureBuilder.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyScriptStructureBuilder.java 2007-02-28 11:57:16 UTC (rev 2053)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyScriptStructureBuilder.java 2007-02-28 13:16:56 UTC (rev 2054)
@@ -505,7 +505,7 @@
String name = getFullyQualifiedName(iVisited.getCPath());
RubyType handle = new RubyType(modelStack.peek(), name);
RubyElement parent = modelStack.peek();
- RubyType existing = (RubyType) findChild(parent, IRubyElement.TYPE, name);
+ RubyType existing = findChild(parent, IRubyElement.TYPE, name);
if (existing != null) {
// FIXME Should we just increment the occurence count like I do here, or should we conglomerate the types into one LogicalType?
handle.occurrenceCount = existing.occurrenceCount + 1;
@@ -1323,7 +1323,7 @@
String name = getFullyQualifiedName(iVisited.getCPath());
RubyModule module = new RubyModule(modelStack.peek(), name);
RubyElement parent = modelStack.peek();
- RubyType existing = (RubyType) findChild(parent, IRubyElement.TYPE, name);
+ RubyType existing = findChild(parent, IRubyElement.TYPE, name);
if (existing != null) {
// FIXME Should we just increment the occurence count like I do here, or should we conglomerate the types into one LogicalType?
module.occurrenceCount = existing.occurrenceCount + 1;
Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/ti/TypeInferenceVisitor.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/ti/TypeInferenceVisitor.java 2007-02-28 11:57:16 UTC (rev 2053)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/ti/TypeInferenceVisitor.java 2007-02-28 13:16:56 UTC (rev 2054)
@@ -20,7 +20,7 @@
private Scope globalScope;
private Scope currentScope;
- // todo: init globalScope to null, push in first non-null node as
+ // TODO: init globalScope to null, push in first non-null node as
// globalScope
public TypeInferenceVisitor( Node rootNode ) {
System.out.println("Instantiating new TypeInferenceVisitor with root node " + stringifyNode(rootNode) );
@@ -31,15 +31,15 @@
public Instruction handleNode(Node iVisited) {
- if ( iVisited != null )
- {
- String pos = "";
- String cls = "";
- if ( iVisited.getPosition() != null ) pos = Integer.toString(iVisited.getPosition().getStartLine());
- if ( iVisited.getClass() != null ) cls = iVisited.getClass().getName();
+// if ( iVisited != null )
+// {
+// String pos = "";
+// String cls = "";
+// if ( iVisited.getPosition() != null ) pos = Integer.toString(iVisited.getPosition().getStartLine());
+// if ( iVisited.getClass() != null ) cls = iVisited.getClass().getName();
// System.out.println("Visiting " + iVisited.getClass().getSimpleName() + "\tat line " + pos + " of class " + cls );
- System.out.println(" - Spanning " + iVisited.getPosition().getStartOffset() + "-" + iVisited.getPosition().getEndOffset());
- }
+// System.out.println(" - Spanning " + iVisited.getPosition().getStartOffset() + "-" + iVisited.getPosition().getEndOffset());
+// }
return super.handleNode(iVisited);
}
@@ -70,7 +70,7 @@
public Instruction visitDefnNode(DefnNode iVisited) {
Scope newScope = pushScope( iVisited );
Variable.insertLocalsFromScopeNode(iVisited.getScope(), newScope);
- // todo: insert from argsNodes
+ // TODO: insert from argsNodes
return super.visitDefnNode(iVisited);
}
@@ -81,7 +81,7 @@
public Instruction visitDefsNode(DefsNode iVisited) {
Scope newScope = pushScope( iVisited );
Variable.insertLocalsFromScopeNode(iVisited.getScope(), newScope);
- // todo: insert from argsNodes
+ // TODO: insert from argsNodes
return super.visitDefsNode(iVisited);
}
@@ -89,10 +89,10 @@
* Visit an IterNode, and extract variable references from it
*/
public Instruction visitIterNode(IterNode iVisited) {
- // todo: push iterator var into the iter's scope.
- Scope newScope = pushScope(iVisited);
+ // TODO: push iterator var into the iter's scope.
+// Scope newScope = pushScope(iVisited);
// newScope.getVariables().add( new Variable( newScope, ))
- // todo: insert from varNode; either DAsgnNode or LocalAsgnNode
+ // TODO: insert from varNode; either DAsgnNode or LocalAsgnNode
// depending... (see: block local var ambiguity)
pushScope( iVisited );
return super.visitIterNode(iVisited);
@@ -112,8 +112,8 @@
return newScope;
}
- // todo: how to tell when to do this?
- // todo: perhaps model IndexUpdater rather than InOrderVisitor
+ // TODO: how to tell when to do this?
+ // TODO: perhaps model IndexUpdater rather than InOrderVisitor
private void popScope()
{
currentScope = currentScope.getParentScope();
@@ -128,7 +128,7 @@
if ( var != null )
{
// System.out.println("Call: " + var.getName() + "." + iVisited.getName() );
- // todo: add call to list
+ // TODO: add call to list
}
return super.visitCallNode(iVisited);
}
@@ -148,10 +148,10 @@
LocalVarNode localVarNode = (LocalVarNode) node;
return currentScope.getLocalVariableByCount(localVarNode.getIndex());
}
- // todo: InstVarNode
- // todo: GlobalVarNode
- // todo: ClassVarNode
- // todo: DVarNode
+ // TODO: InstVarNode
+ // TODO: GlobalVarNode
+ // TODO: ClassVarNode
+ // TODO: DVarNode
return null;
}
@@ -168,7 +168,7 @@
if ( currentScope == globalScope )
{
// Yes - stick this variable into the global scope.
- // todo: Shouldn't JRuby give a ScopeNode w/ a .getLocalNames()
+ // TODO: Shouldn't JRuby give a ScopeNode w/ a .getLocalNames()
// for the global script?
var = new Variable( globalScope, iVisited.getName(), iVisited.getIndex() );
currentScope.getVariables().add(var);
@@ -186,7 +186,7 @@
var.getTypeGuesses().add( new BasicTypeGuess( concreteGuess, 100 ) );
}
// else if ( valueNode instanceof LocalVarNode ) {
-// // todo: this method needs to be fixed... see
+// // TODO: this method needs to be fixed... see
// // ReferenceTypeGuess.java
// LocalVarNode rhsNode = (LocalVarNode)valueNode;
// Variable rhsVar = currentScope.getLocalVariableByCount(rhsNode.getCount());
Modified: trunk/org.rubypeople.rdt.core.tests/src/RubyParserCmd.java
===================================================================
--- trunk/org.rubypeople.rdt.core.tests/src/RubyParserCmd.java 2007-02-28 11:57:16 UTC (rev 2053)
+++ trunk/org.rubypeople.rdt.core.tests/src/RubyParserCmd.java 2007-02-28 13:16:56 UTC (rev 2054)
@@ -14,12 +14,9 @@
import org.jruby.lexer.yacc.SyntaxException;
import org.rubypeople.eclipse.shams.resources.ShamFile;
import org.rubypeople.rdt.internal.core.DefaultWorkingCopyOwner;
-import org.rubypeople.rdt.internal.core.RubyProject;
import org.rubypeople.rdt.internal.core.RubyScript;
import org.rubypeople.rdt.internal.core.RubyScriptElementInfo;
import org.rubypeople.rdt.internal.core.RubyScriptStructureBuilder;
-import org.rubypeople.rdt.internal.core.SourceFolder;
-import org.rubypeople.rdt.internal.core.SourceFolderRoot;
import org.rubypeople.rdt.internal.core.parser.RdtWarnings;
import org.rubypeople.rdt.internal.core.parser.RubyParser;
Modified: trunk/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/TC_MassIndexUpdater.java
===================================================================
--- trunk/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/TC_MassIndexUpdater.java 2007-02-28 11:57:16 UTC (rev 2053)
+++ trunk/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/TC_MassIndexUpdater.java 2007-02-28 13:16:56 UTC (rev 2054)
@@ -53,9 +53,7 @@
ShamMonitor monitor = new ShamMonitor();
massUpdater.updateProjects(projects, monitor);
- RubySourceFileCollectingVisitor expectedVisitor =
- new RubySourceFileCollectingVisitor(new ArrayList());
-
+
parser.assertParsed(file1);
parser.assertParsed(file2);
parser.assertParsed(file3);
Modified: trunk/org.rubypeople.rdt.debug.core.tests/src/org/rubypeople/rdt/debug/core/tests/FTC_ClassicDebuggerCommunicationTest.java
===================================================================
--- trunk/org.rubypeople.rdt.debug.core.tests/src/org/rubypeople/rdt/debug/core/tests/FTC_ClassicDebuggerCommunicationTest.java 2007-02-28 11:57:16 UTC (rev 2053)
+++ trunk/org.rubypeople.rdt.debug.core.tests/src/org/rubypeople/rdt/debug/core/tests/FTC_ClassicDebuggerCommunicationTest.java 2007-02-28 13:16:56 UTC (rev 2054)
@@ -122,7 +122,7 @@
sendRuby("th l");
threadInfos = getThreadInfoReader().readThreads();
assertEquals(1, threadInfos.length);
- assertNotSame(point1.getThreadId(), point2.getThreadId());
+ assertNotSame(Integer.valueOf(point1.getThreadId()), Integer.valueOf(point2.getThreadId()));
}
public void testThreadIdsAndResume() throws Exception {
Modified: trunk/org.rubypeople.rdt.debug.core.tests/src/org/rubypeople/rdt/debug/core/tests/FTC_RubyDebugCommunicationTest.java
===================================================================
--- trunk/org.rubypeople.rdt.debug.core.tests/src/org/rubypeople/rdt/debug/core/tests/FTC_RubyDebugCommunicationTest.java 2007-02-28 11:57:16 UTC (rev 2053)
+++ trunk/org.rubypeople.rdt.debug.core.tests/src/org/rubypeople/rdt/debug/core/tests/FTC_RubyDebugCommunicationTest.java 2007-02-28 13:16:56 UTC (rev 2054)
@@ -1,17 +1,8 @@
package org.rubypeople.rdt.debug.core.tests;
-import java.io.PrintWriter;
-import java.net.ConnectException;
-import java.net.Socket;
-
import org.rubypeople.rdt.core.RubyCore;
-import org.rubypeople.rdt.internal.debug.core.SuspensionPoint;
import org.rubypeople.rdt.internal.debug.core.commands.AbstractDebuggerConnection;
-import org.rubypeople.rdt.internal.debug.core.commands.EvalCommand;
import org.rubypeople.rdt.internal.debug.core.commands.RubyDebugConnection;
-import org.rubypeople.rdt.internal.debug.core.parsing.AbstractReadStrategy;
-import org.rubypeople.rdt.internal.debug.core.parsing.EvalReader;
-import org.rubypeople.rdt.internal.debug.core.parsing.MultiReaderStrategy;
import org.rubypeople.rdt.internal.launching.LaunchingPlugin;
public class FTC_RubyDebugCommunicationTest extends FTC_ClassicDebuggerCommunicationTest {
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-02-28 11:57:16 UTC (rev 2053)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/DefaultProjectLoadpathEntry.java 2007-02-28 13:16:56 UTC (rev 2054)
@@ -306,9 +306,9 @@
*/
public String getName() {
if (isExportedEntriesOnly()) {
- return MessageFormat.format(LaunchingMessages.DefaultProjectLoadpathEntry_2, new String[] {getRubyProject().getElementName()});
+ return MessageFormat.format(LaunchingMessages.DefaultProjectLoadpathEntry_2, getRubyProject().getElementName());
}
- return MessageFormat.format(LaunchingMessages.DefaultProjectLoadpathEntry_4, new String[] {getRubyProject().getElementName()});
+ return MessageFormat.format(LaunchingMessages.DefaultProjectLoadpathEntry_4, getRubyProject().getElementName());
}
/* (non-Rubydoc)
* @see java.lang.Object#equals(java.lang.Object)
Modified: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/LaunchingPlugin.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/LaunchingPlugin.java 2007-02-28 11:57:16 UTC (rev 2053)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/LaunchingPlugin.java 2007-02-28 13:16:56 UTC (rev 2054)
@@ -590,7 +590,7 @@
}
IConfigurationElement config = (IConfigurationElement) fClasspathEntryExtensions.get(id);
if (config == null) {
- abort(MessageFormat.format(LaunchingMessages.LaunchingPlugin_32, new String[]{id}), null);
+ abort(MessageFormat.format(LaunchingMessages.LaunchingPlugin_32, id), null);
}
return (IRuntimeLoadpathEntry2) config.createExecutableExtension("class"); //$NON-NLS-1$
}
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-02-28 11:57:16 UTC (rev 2053)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RuntimeLoadpathEntry.java 2007-02-28 13:16:56 UTC (rev 2054)
@@ -96,7 +96,7 @@
setType(VARIABLE);
break;
default:
- throw new IllegalArgumentException(MessageFormat.format(LaunchingMessages.RuntimeLoadpathEntry_Illegal_classpath_entry__0__1, new String[] {entry.toString()}));
+ throw new IllegalArgumentException(MessageFormat.format(LaunchingMessages.RuntimeLoadpathEntry_Illegal_classpath_entry__0__1, entry.toString()));
}
setLoadpathEntry(entry);
initializeLoadpathProperty();
@@ -114,7 +114,7 @@
setType(CONTAINER);
break;
default:
- throw new IllegalArgumentException(MessageFormat.format(LaunchingMessages.RuntimeLoadpathEntry_Illegal_classpath_entry__0__1, new String[] {entry.toString()}));
+ throw new IllegalArgumentException(MessageFormat.format(LaunchingMessages.RuntimeLoadpathEntry_Illegal_classpath_entry__0__1,entry.toString()));
}
setLoadpathEntry(entry);
setLoadpathProperty(classpathProperty);
Modified: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/StandardVMRunner.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/StandardVMRunner.java 2007-02-28 11:57:16 UTC (rev 2053)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/StandardVMRunner.java 2007-02-28 13:16:56 UTC (rev 2054)
@@ -42,13 +42,13 @@
protected String renderDebugTarget(String classToRun, int host) {
String format= LaunchingMessages.StandardVMRunner__0__at_localhost__1__1;
- return MessageFormat.format(format, new String[] { classToRun, String.valueOf(host) });
+ return MessageFormat.format(format, classToRun, String.valueOf(host));
}
public static String renderProcessLabel(String[] commandLine) {
String format= LaunchingMessages.StandardVMRunner__0____1___2;
String timestamp= DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM).format(new Date(System.currentTimeMillis()));
- return MessageFormat.format(format, new String[] { commandLine[0], timestamp });
+ return MessageFormat.format(format, commandLine[0], timestamp);
}
protected static String renderCommandLine(String[] commandLine) {
@@ -105,7 +105,7 @@
}
File dir = new File(path);
if (!dir.isDirectory()) {
- abort(MessageFormat.format(LaunchingMessages.StandardVMRunner_Specified_working_directory_does_not_exist_or_is_not_a_directory___0__3, new String[] {path}), null, IRubyLaunchConfigurationConstants.ERR_WORKING_DIRECTORY_DOES_NOT_EXIST);
+ abort(MessageFormat.format(LaunchingMessages.StandardVMRunner_Specified_working_directory_does_not_exist_or_is_not_a_directory___0__3, path), null, IRubyLaunchConfigurationConstants.ERR_WORKING_DIRECTORY_DOES_NOT_EXIST);
}
return dir;
}
@@ -137,7 +137,7 @@
if (command == null) {
File exe = StandardVMType.findRubyExecutable(fVMInstance.getInstallLocation());
if (exe == null) {
- abort(MessageFormat.format(LaunchingMessages.StandardVMRunner_Unable_to_locate_executable_for__0__1, new String[]{fVMInstance.getName()}), null, IRubyLaunchConfigurationConstants.ERR_INTERNAL_ERROR);
+ abort(MessageFormat.format(LaunchingMessages.StandardVMRunner_Unable_to_locate_executable_for__0__1, fVMInstance.getName()), null, IRubyLaunchConfigurationConstants.ERR_INTERNAL_ERROR);
}
return exe.getAbsolutePath();
}
@@ -154,7 +154,7 @@
}
// not found
- abort(MessageFormat.format(LaunchingMessages.StandardVMRunner_Specified_executable__0__does_not_exist_for__1__4, new String[]{command, fVMInstance.getName()}), null, IRubyLaunchConfigurationConstants.ERR_INTERNAL_ERROR);
+ abort(MessageFormat.format(LaunchingMessages.StandardVMRunner_Specified_executable__0__does_not_exist_for__1__4, command, fVMInstance.getName()), null, IRubyLaunchConfigurationConstants.ERR_INTERNAL_ERROR);
// NOTE: an exception will be thrown - null cannot be returned
return null;
}
Modified: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/StandardVMType.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/StandardVMType.java 2007-02-28 11:57:16 UTC (rev 2053)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/StandardVMType.java 2007-02-28 13:16:56 UTC (rev 2054)
@@ -174,7 +174,7 @@
}
if (info == null) {
// log error that we were unable to generate library info - see bug 70011
- LaunchingPlugin.log(MessageFormat.format("Failed to retrieve default libraries for {0}", new String[]{rubyHome.getAbsolutePath()})); //$NON-NLS-1$
+ LaunchingPlugin.log(MessageFormat.format("Failed to retrieve default libraries for {0}", rubyHome.getAbsolutePath())); //$NON-NLS-1$
}
return info;
}
Modified: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/AbstractRubyLaunchConfigurationDelegate.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/AbstractRubyLaunchConfigurationDelegate.java 2007-02-28 11:57:16 UTC (rev 2053)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/AbstractRubyLaunchConfigurationDelegate.java 2007-02-28 13:16:56 UTC (rev 2054)
@@ -120,7 +120,7 @@
abort(
MessageFormat.format(
LaunchingMessages.AbstractJavaLaunchConfigurationDelegate_Working_directory_does_not_exist___0__12,
- new String[]{dir.toString()}),
+ dir.toString()),
null,
IRubyLaunchConfigurationConstants.ERR_WORKING_DIRECTORY_DOES_NOT_EXIST);
}
@@ -143,7 +143,7 @@
MessageFormat
.format(
LaunchingMessages.AbstractJavaLaunchConfigurationDelegate_Working_directory_does_not_exist___0__12,
- new String[]{path.toString()}),
+ path.toString()),
null,
IRubyLaunchConfigurationConstants.ERR_WORKING_DIRECTORY_DOES_NOT_EXIST);
} else {
@@ -156,7 +156,7 @@
MessageFormat
.format(
LaunchingMessages.AbstractJavaLaunchConfigurationDelegate_Working_directory_does_not_exist___0__12,
- new String[]{path.toString()}),
+ path.toString()),
null,
IRubyLaunchConfigurationConstants.ERR_WORKING_DIRECTORY_DOES_NOT_EXIST);
}
@@ -287,7 +287,7 @@
IVMInstall vm = verifyVMInstall(configuration);
IVMRunner runner = vm.getVMRunner(mode);
if (runner == null) {
- abort(MessageFormat.format(LaunchingMessages.JavaLocalApplicationLaunchConfigurationDelegate_0, new String[]{vm.getName(), mode}), null, IRubyLaunchConfigurationConstants.ERR_VM_RUNNER_DOES_NOT_EXIST);
+ abort(MessageFormat.format(LaunchingMessages.JavaLocalApplicationLaunchConfigurationDelegate_0, vm.getName(), mode), null, IRubyLaunchConfigurationConstants.ERR_VM_RUNNER_DOES_NOT_EXIST);
}
return runner;
}
@@ -319,7 +319,7 @@
MessageFormat
.format(
LaunchingMessages.AbstractJavaLaunchConfigurationDelegate_JRE_home_directory_not_specified_for__0__5,
- new String[]{vm.getName()}),
+ vm.getName()),
null,
IRubyLaunchConfigurationConstants.ERR_VM_INSTALL_DOES_NOT_EXIST);
}
@@ -328,8 +328,7 @@
MessageFormat
.format(
LaunchingMessages.AbstractJavaLaunchConfigurationDelegate_JRE_home_directory_for__0__does_not_exist___1__6,
- new String[]{vm.getName(),
- location.getAbsolutePath()}),
+ vm.getName(), location.getAbsolutePath()),
null,
IRubyLaunchConfigurationConstants.ERR_VM_INSTALL_DOES_NOT_EXIST);
}
Modified: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/AbstractVMInstallType.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/AbstractVMInstallType.java 2007-02-28 11:57:16 UTC (rev 2053)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/AbstractVMInstallType.java 2007-02-28 13:16:56 UTC (rev 2054)
@@ -88,7 +88,7 @@
public IVMInstall createVMInstall(String id) throws IllegalArgumentException {
if (findVMInstall(id) != null) {
String format= LaunchingMessages.vmInstallType_duplicateVM;
- throw new IllegalArgumentException(MessageFormat.format(format, new String[] { id }));
+ throw new IllegalArgumentException(MessageFormat.format(format, id));
}
IVMInstall vm= doCreateVMInstall(id);
fVMs.add(vm);
Modified: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/RubyLaunchDelegate.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/RubyLaunchDelegate.java 2007-02-28 11:57:16 UTC (rev 2053)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/RubyLaunchDelegate.java 2007-02-28 13:16:56 UTC (rev 2054)
@@ -39,7 +39,7 @@
monitor = new NullProgressMonitor();
}
- monitor.beginTask(MessageFormat.format("{0}...", new String[]{configuration.getName()}), 3); //$NON-NLS-1$
+ monitor.beginTask(MessageFormat.format("{0}...", configuration.getName()), 3); //$NON-NLS-1$
// check for cancellation
if (monitor.isCanceled()) {
return;
Modified: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/RubyRuntime.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/RubyRuntime.java 2007-02-28 11:57:16 UTC (rev 2053)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/RubyRuntime.java 2007-02-28 13:16:56 UTC (rev 2054)
@@ -804,21 +804,24 @@
IVMInstallType vt = getVMInstallType(type);
if (vt == null) {
// error type does not exist
- abort(MessageFormat.format(LaunchingMessages.JavaRuntime_Specified_VM_install_type_does_not_exist___0__2, new String[] {type}), null);
+ abort(MessageFormat.format(LaunchingMessages.JavaRuntime_Specified_VM_install_type_does_not_exist___0__2, type), null);
}
IVMInstall vm = null;
// look for a name
if (name == null) {
// error - type specified without a specific install (could be an old config that specified a VM ID)
// log the error, but choose the default VM.
- IStatus status = new Status(IStatus.WARNING, LaunchingPlugin.getUniqueIdentifier(), IRubyLaunchConfigurationConstants.ERR_UNSPECIFIED_VM_INSTALL, MessageFormat.format(LaunchingMessages.JavaRuntime_VM_not_fully_specified_in_launch_configuration__0____missing_VM_name__Reverting_to_default_VM__1, new String[] {configuration.getName()}), null);
+ IStatus status = new Status(IStatus.WARNING, LaunchingPlugin.getUniqueIdentifier(),
+ IRubyLaunchConfigurationConstants.ERR_UNSPECIFIED_VM_INSTALL,
+ MessageFormat.format(LaunchingMessages.JavaRuntime_VM_not_fully_specified_in_launch_configuration__0____missing_VM_name__Reverting_to_default_VM__1, configuration.getName()),
+ null);
LaunchingPlugin.log(status);
return getDefaultVMInstall();
}
vm = vt.findVMInstallByName(name);
if (vm == null) {
// error - install not found
- abort(MessageFormat.format(LaunchingMessages.JavaRuntime_Specified_VM_install_not_found__type__0___name__1__2, new String[] {vt.getName(), name}), null);
+ abort(MessageFormat.format(LaunchingMessages.JavaRuntime_Specified_VM_install_not_found__type__0___name__1__2, vt.getName(), name), null);
} else {
return vm;
}
@@ -942,10 +945,10 @@
}
IRubyProject javaProject = getRubyModel().getRubyProject(projectName);
if (javaProject != null && javaProject.getProject().exists() && !javaProject.getProject().isOpen()) {
- abort(MessageFormat.format(LaunchingMessages.JavaRuntime_28, new String[] {configuration.getName(), projectName}), IRubyLaunchConfigurationConstants.ERR_PROJECT_CLOSED, null);
+ abort(MessageFormat.format(LaunchingMessages.JavaRuntime_28, configuration.getName(), projectName), IRubyLaunchConfigurationConstants.ERR_PROJECT_CLOSED, null);
}
if ((javaProject == null) || !javaProject.exists()) {
- abort(MessageFormat.format(LaunchingMessages.JavaRuntime_Launch_configuration__0__references_non_existing_project__1___1, new String[] {configuration.getName(), projectName}), IRubyLaunchConfigurationConstants.ERR_NOT_A_RUBY_PROJECT, null);
+ abort(MessageFormat.format(LaunchingMessages.JavaRuntime_Launch_configuration__0__references_non_existing_project__1___1,configuration.getName(), projectName), IRubyLaunchConfigurationConstants.ERR_NOT_A_RUBY_PROJECT, null);
}
return javaProject;
}
@@ -1050,7 +1053,7 @@
} else {
provider = (IRuntimeLoadpathProvider)getLoadpathProviders().get(providerId);
if (provider == null) {
- abort(MessageFormat.format(LaunchingMessages.JavaRuntime_26, new String[]{providerId}), null);
+ abort(MessageFormat.format(LaunchingMessages.JavaRuntime_26, providerId), null);
}
}
return provider;
@@ -1342,7 +1345,7 @@
}
} else {
// could not resolve project
- abort(MessageFormat.format(LaunchingMessages.JavaRuntime_Classpath_references_non_existant_project___0__3, new String[]{entry.getPath().lastSegment()}), null);
+ abort(MessageFormat.format(LaunchingMessages.JavaRuntime_Classpath_references_non_existant_project___0__3, entry.getPath().lastSegment()), null);
}
break;
case IRuntimeLoadpathEntry.VARIABLE:
@@ -1365,11 +1368,11 @@
// verify the archive exists
String location = entry.getLocation();
if (location == null) {
- abort(MessageFormat.format(LaunchingMessages.JavaRuntime_Classpath_references_non_existant_archive___0__4, new String[]{entry.getPath().toString()}), null);
+ abort(MessageFormat.format(LaunchingMessages.JavaRuntime_Classpath_references_non_existant_archive___0__4, entry.getPath().toString()), null);
}
File file = new File(location);
if (!file.exists()) {
- abort(MessageFormat.format(LaunchingMessages.JavaRuntime_Classpath_references_non_existant_archive___0__4, new String[]{entry.getPath().toString()}), null);
+ abort(MessageFormat.format(LaunchingMessages.JavaRuntime_Classpath_references_non_existant_archive___0__4, entry.getPath().toString()), null);
}
break;
case IRuntimeLoadpathEntry.OTHER:
@@ -1404,7 +1407,7 @@
}
ILoadpathContainer container = RubyCore.getLoadpathContainer(entry.getPath(), project);
if (container == null) {
- abort(MessageFormat.format(LaunchingMessages.JavaRuntime_Could_not_resolve_classpath_container___0__1, new String[]{entry.getPath().toString()}), null);
+ abort(MessageFormat.format(LaunchingMessages.JavaRuntime_Could_not_resolve_classpath_container___0__1,entry.getPath().toString()), null);
// execution will not reach here - exception will be thrown
return null;
}
Modified: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/extractmethod/ExtractedMethodHelper.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/extractmethod/ExtractedMethodHelper.java 2007-02-28 11:57:16 UTC (rev 2053)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/extractmethod/ExtractedMethodHelper.java 2007-02-28 13:16:56 UTC (rev 2054)
@@ -111,7 +111,7 @@
int aktStartOffset = aktNode.getPosition().getStartOffset();
if (aktStartOffset > endPostOfLastSelectedNode) {
LocalNodeWrapper localNode = new LocalNodeWrapper(aktNode);
- afterSelectionNodes.put(localNode.getId(), localNode);
+ afterSelectionNodes.put(Integer.valueOf(localNode.getId()), localNode);
}
}
}
@@ -174,7 +174,7 @@
}
private boolean localNodeNeededAfterSelectedNodes(LocalNodeWrapper localNode) {
- return afterSelectionNodes.containsKey(localNode.getId());
+ return afterSelectionNodes.containsKey(Integer.valueOf(localNode.getId()));
}
public Node getMethodNode(boolean needsNewLineAtBeginOfBlock, boolean needsNewLineAtEndOfBlock) {
Modified: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/documentprovider/WorkspaceDocumentProvider.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/documentprovider/WorkspaceDocumentProvider.java 2007-02-28 11:57:16 UTC (rev 2053)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/documentprovider/WorkspaceDocumentProvider.java 2007-02-28 13:16:56 UTC (rev 2054)
@@ -40,6 +40,7 @@
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.Path;
+import org.rubypeople.rdt.core.RubyModelException;
import org.rubypeople.rdt.internal.core.util.Util;
public class WorkspaceDocumentProvider extends DocumentProvider {
@@ -106,9 +107,10 @@
IFile currentFile = getIFile(fileName);
try {
return new String(Util.getResourceContentsAsCharArray(currentFile));
- } catch (CoreException e) {
- e.printStackTrace();
}
+ catch (RubyModelException e) {
+ /** Resource does not exist, that happens if a library file is included from an external location.**/
+ }
return null;
}
Modified: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/nodewrapper/SClassNodeWrapper.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/nodewrapper/SClassNodeWrapper.java 2007-02-28 11:57:16 UTC (rev 2053)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/nodewrapper/SClassNodeWrapper.java 2007-02-28 13:16:56 UTC (rev 2054)
@@ -79,8 +79,8 @@
}
private Node getReferencedNode(int id, Map<Integer, Node> references) throws UnknownReferenceException {
- if (references.containsKey(id)) {
- return references.get(id);
+ if (references.containsKey(Integer.valueOf(id))) {
+ return references.get(Integer.valueOf(id));
}
throw new UnknownReferenceException();
}
@@ -101,7 +101,7 @@
for (Node node : referencedNodes) {
if (node instanceof LocalAsgnNode) {
LocalAsgnNode localAsgnNode = (LocalAsgnNode) node;
- references.put(localAsgnNode.getIndex(), node);
+ references.put(Integer.valueOf(localAsgnNode.getIndex()), node);
}
}
return references;
Modified: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/ExtractMethodPage.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/ExtractMethodPage.java 2007-02-28 11:57:16 UTC (rev 2053)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/ExtractMethodPage.java 2007-02-28 13:16:56 UTC (rev 2054)
@@ -202,7 +202,7 @@
}
public void setComplete(Object source, boolean complete) {
- completedValidators.put(source, complete);
+ completedValidators.put(source, Boolean.valueOf(complete));
boolean allOk = true;
for (boolean ok : completedValidators.values()) {
Modified: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/util/NameHelper.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/util/NameHelper.java 2007-02-28 11:57:16 UTC (rev 2053)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/util/NameHelper.java 2007-02-28 13:16:56 UTC (rev 2054)
@@ -48,7 +48,7 @@
public static String createName(String string) {
Matcher matcher = Pattern.compile("([@]{0,2}\\w*[a-zA-Z_])(\\d+)").matcher(string);
if (matcher.matches()) {
- return matcher.group(1) + String.valueOf(Integer.valueOf(matcher.group(2)) + 1);
+ return matcher.group(1) + String.valueOf(Integer.valueOf(matcher.group(2)).intValue() + 1);
}
return string + 1;
}
Modified: trunk/org.rubypeople.rdt.testunit/src/org/rubypeople/rdt/testunit/launcher/TestUnitLaunchShortcut.java
===================================================================
--- trunk/org.rubypeople.rdt.testunit/src/org/rubypeople/rdt/testunit/launcher/TestUnitLaunchShortcut.java 2007-02-28 11:57:16 UTC (rev 2053)
+++ trunk/org.rubypeople.rdt.testunit/src/org/rubypeople/rdt/testunit/launcher/TestUnitLaunchShortcut.java 2007-02-28 13:16:56 UTC (rev 2054)
@@ -74,7 +74,7 @@
case 0:
return createConfiguration(rubyFile, container, testName);
case 1:
- return (ILaunchConfiguration) candidateConfigs.get(0);
+ return candidateConfigs.get(0);
default:
ILaunchConfiguration config = chooseConfiguration(candidateConfigs, mode);
if (config != null) { return config; }
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/infoviews/RIView.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/infoviews/RIView.java 2007-02-28 11:57:16 UTC (rev 2053)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/infoviews/RIView.java 2007-02-28 13:16:56 UTC (rev 2054)
@@ -182,7 +182,7 @@
}
private void updatePage() {
- IVMInstall interpreter = RubyRuntime.getDefault().getDefaultVMInstall();
+ IVMInstall interpreter = RubyRuntime.getDefaultVMInstall();
if (interpreter != null) {
initSearchList();
if( riFound ){
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/PreferenceConstants.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/PreferenceConstants.java 2007-02-28 11:57:16 UTC (rev 2053)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/PreferenceConstants.java 2007-02-28 13:16:56 UTC (rev 2054)
@@ -782,7 +782,7 @@
}
private static String getDefaultPath(String programName) {
- IVMInstall interpreter = RubyRuntime.getDefault().getDefaultVMInstall();
+ IVMInstall interpreter = RubyRuntime.getDefaultVMInstall();
if (interpreter == null) {
return programName;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
