Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 149151 Details for
Bug 291665
[Tooling] Launcher doesn't compile with PDE I Build
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
[patch]
Patch
clipboard.txt (text/plain), 5.91 KB, created by
RĂ¼diger Herrmann
on 2009-10-08 14:01:57 EDT
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
RĂ¼diger Herrmann
Created:
2009-10-08 14:01:57 EDT
Size:
5.91 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.rap.ui.launch >Index: src/org/eclipse/rap/ui/internal/launch/RAPLaunchConfigValidator.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/tooling/org.eclipse.rap.ui.launch/src/org/eclipse/rap/ui/internal/launch/RAPLaunchConfigValidator.java,v >retrieving revision 1.8 >diff -u -r1.8 RAPLaunchConfigValidator.java >--- src/org/eclipse/rap/ui/internal/launch/RAPLaunchConfigValidator.java 5 May 2009 17:23:10 -0000 1.8 >+++ src/org/eclipse/rap/ui/internal/launch/RAPLaunchConfigValidator.java 8 Oct 2009 18:04:17 -0000 >@@ -18,8 +18,8 @@ > > import org.eclipse.core.runtime.*; > import org.eclipse.debug.core.*; >+import org.eclipse.pde.internal.launching.launcher.OSGiFrameworkManager; > import org.eclipse.pde.internal.ui.PDEPlugin; >-import org.eclipse.pde.internal.ui.launcher.OSGiFrameworkManager; > import org.eclipse.pde.ui.launcher.IPDELauncherConstants; > > >@@ -36,9 +36,6 @@ > private static final String RAP_LAUNCH_CONFIG_TYPE > = "org.eclipse.rap.ui.launch.RAPLauncher"; //$NON-NLS-1$ > >- private static final String EQUINOX_FRAMEWORK >- = "org.eclipse.pde.ui.EquinoxFramework"; //$NON-NLS-1$ >- > private static final String EMPTY = ""; //$NON-NLS-1$ > > >@@ -57,7 +54,6 @@ > addNonOKState( states, validateUniquePort() ); > addNonOKState( states, validateURL() ); > addNonOKState( states, validateLogLevel() ); >- addNonOKState( states, validateOSGiFramework() ); > } catch( CoreException e ) { > String text > = LaunchMessages.RAPLaunchConfigValidator_ErrorWhileValidating; >@@ -163,16 +159,6 @@ > return result; > } > >- private IStatus validateOSGiFramework() throws CoreException { >- IStatus result = Status.OK_STATUS; >- String frameworkId = getOSGiFrameworkId(); >- if( !EQUINOX_FRAMEWORK.equals( frameworkId ) ) { >- String msg = LaunchMessages.RAPLaunchConfigValidator_EquinoxOnly; >- result = createWarning( msg, WARN_OSGI_FRAMEWORK, null ); >- } >- return result; >- } >- > ///////////////////////// > // Status creation helper > >@@ -215,16 +201,4 @@ > && !config.getName().equals( otherConfig.getName() ) > && config.getPort() == otherConfig.getPort(); > } >- >- //////////////////////////////////////////// >- // Helping methods for validateOSGiFramework >- >- private String getOSGiFrameworkId() throws CoreException { >- ILaunchConfiguration launchConfig = config.getUnderlyingLaunchConfig(); >- OSGiFrameworkManager manager >- = PDEPlugin.getDefault().getOSGiFrameworkManager(); >- String defaultFrameworkId = manager.getDefaultFramework(); >- String attributeName = IPDELauncherConstants.OSGI_FRAMEWORK_ID; >- return launchConfig.getAttribute( attributeName, defaultFrameworkId ); >- } > } >Index: src/org/eclipse/rap/ui/internal/launch/LaunchMessages.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/tooling/org.eclipse.rap.ui.launch/src/org/eclipse/rap/ui/internal/launch/LaunchMessages.java,v >retrieving revision 1.2 >diff -u -r1.2 LaunchMessages.java >--- src/org/eclipse/rap/ui/internal/launch/LaunchMessages.java 4 Jun 2009 11:43:23 -0000 1.2 >+++ src/org/eclipse/rap/ui/internal/launch/LaunchMessages.java 8 Oct 2009 18:04:17 -0000 >@@ -37,7 +37,8 @@ > public static String RAPLaunchDelegate_StartClientTaskName; > public static String RAPLaunchDelegate_TerminatePreviousTaskName; > public static String RAPLaunchDelegate_WaitForHTTPTaskName; >- >+ public static String RAPLaunchDelegate_Error_NotAPlugin; >+ > public static String SelectionDialogUtil_Unknown; > public static String SelectionDialogUtil_UnknownProject; > >Index: src/org/eclipse/rap/ui/internal/launch/messages.properties >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/tooling/org.eclipse.rap.ui.launch/src/org/eclipse/rap/ui/internal/launch/messages.properties,v >retrieving revision 1.2 >diff -u -r1.2 messages.properties >--- src/org/eclipse/rap/ui/internal/launch/messages.properties 4 Jun 2009 11:43:23 -0000 1.2 >+++ src/org/eclipse/rap/ui/internal/launch/messages.properties 8 Oct 2009 18:04:17 -0000 >@@ -31,6 +31,8 @@ > RAPLaunchDelegate_StartClientTaskName=Starting client application > RAPLaunchDelegate_TerminatePreviousTaskName=Terminating previous launch > RAPLaunchDelegate_WaitForHTTPTaskName=Waiting for HTTP service >+RAPLaunchDelegate_Error_NotAPlugin = Could not launch the JUnit plug-in tests because project ''{0}'' is not a plug-in project. >+ > > SelectionDialogUtil_Unknown=(unknown) > SelectionDialogUtil_UnknownProject=(unknown project) >Index: src/org/eclipse/rap/ui/internal/launch/junit/RAPJUnitLaunchConfigurationDelegate.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/tooling/org.eclipse.rap.ui.launch/src/org/eclipse/rap/ui/internal/launch/junit/RAPJUnitLaunchConfigurationDelegate.java,v >retrieving revision 1.5 >diff -u -r1.5 RAPJUnitLaunchConfigurationDelegate.java >--- src/org/eclipse/rap/ui/internal/launch/junit/RAPJUnitLaunchConfigurationDelegate.java 4 Jun 2009 11:43:22 -0000 1.5 >+++ src/org/eclipse/rap/ui/internal/launch/junit/RAPJUnitLaunchConfigurationDelegate.java 8 Oct 2009 18:04:17 -0000 >@@ -22,7 +22,6 @@ > import org.eclipse.jdt.launching.IVMRunner; > import org.eclipse.osgi.util.NLS; > import org.eclipse.pde.core.plugin.*; >-import org.eclipse.pde.internal.ui.PDEUIMessages; > import org.eclipse.pde.ui.launcher.EquinoxLaunchConfiguration; > import org.eclipse.rap.ui.internal.launch.LaunchMessages; > import org.eclipse.rap.ui.internal.launch.RAPLaunchDelegate; >@@ -157,7 +156,7 @@ > IPluginModelBase model = PluginRegistry.findModel( project ); > if( model == null ) { > String msg >- = NLS.bind( PDEUIMessages.JUnitLaunchConfiguration_error_notaplugin, >+ = NLS.bind( LaunchMessages.RAPLaunchDelegate_Error_NotAPlugin, > project.getName() ); > abort( msg, null, IStatus.OK ); > }
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 291665
: 149151