|
From: Christopher W. <caw...@us...> - 2006-02-22 21:05:44
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/launcher In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2636/src/org/rubypeople/rdt/internal/debug/ui/launcher Modified Files: RubyEnvironmentTab.java Log Message: remove instance where we created a RubyProject with wrong constructor. Fix RubyProject to not override getParent() and return null. Index: RubyEnvironmentTab.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/launcher/RubyEnvironmentTab.java,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** RubyEnvironmentTab.java 13 Dec 2005 21:10:44 -0000 1.22 --- RubyEnvironmentTab.java 22 Feb 2006 21:05:37 -0000 1.23 *************** *** 26,32 **** import org.eclipse.swt.widgets.TabFolder; import org.eclipse.swt.widgets.TabItem; import org.rubypeople.rdt.core.RubyCore; import org.rubypeople.rdt.internal.core.LoadpathEntry; ! import org.rubypeople.rdt.internal.core.RubyProject; import org.rubypeople.rdt.internal.debug.ui.RdtDebugUiMessages; import org.rubypeople.rdt.internal.debug.ui.RdtDebugUiPlugin; --- 26,34 ---- import org.eclipse.swt.widgets.TabFolder; import org.eclipse.swt.widgets.TabItem; + import org.rubypeople.rdt.core.IRubyProject; import org.rubypeople.rdt.core.RubyCore; import org.rubypeople.rdt.internal.core.LoadpathEntry; ! import org.rubypeople.rdt.internal.core.RubyModel; ! import org.rubypeople.rdt.internal.core.RubyModelManager; import org.rubypeople.rdt.internal.debug.ui.RdtDebugUiMessages; import org.rubypeople.rdt.internal.debug.ui.RdtDebugUiPlugin; *************** *** 168,172 **** String projectName = configuration.getAttribute(RubyLaunchConfigurationAttribute.PROJECT_NAME, ""); if (projectName.length() != 0) { ! RubyProject project = RubyCore.getRubyProject(projectName); if (project != null) { List loadPathEntries = project.getLoadPathEntries(); --- 170,174 ---- String projectName = configuration.getAttribute(RubyLaunchConfigurationAttribute.PROJECT_NAME, ""); if (projectName.length() != 0) { ! IRubyProject project = RubyModelManager.getRubyModelManager().getRubyModel().getRubyProject(projectName); if (project != null) { List loadPathEntries = project.getLoadPathEntries(); |