Attachment 199338 Details for Bug 351073 – updated patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] updated patch

351073_v2.patch (text/plain), 9.02 KB, created by Beyhan Veliev

on 2011-07-08 10:48:47 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Beyhan Veliev

Created: 2011-07-08 10:48:47 EDT

Size: 9.02 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.ui.launch
>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.12
>diff -u -r1.12 LaunchMessages.java
>--- src/org/eclipse/rap/ui/internal/launch/LaunchMessages.java	8 Jul 2011 12:53:31 -0000	1.12
>+++ src/org/eclipse/rap/ui/internal/launch/LaunchMessages.java	8 Jul 2011 14:47:39 -0000
>@@ -65,7 +65,6 @@
>   public static String MainTab_RuntimeSettings;
>   public static String MainTab_ServletAndEntryPoint;
>   public static String MainTab_ServletName;
>-  public static String MainTab_TerminatePrevious;
>   public static String ServletNameSelectionDialog_Message;
>   public static String ServletNameSelectionDialog_Searching;
>   public static String ServletNameSelectionDialog_Title;
>Index: src/org/eclipse/rap/ui/internal/launch/RAPLaunchConfig.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/tooling/org.eclipse.rap.ui.launch/src/org/eclipse/rap/ui/internal/launch/RAPLaunchConfig.java,v
>retrieving revision 1.13
>diff -u -r1.13 RAPLaunchConfig.java
>--- src/org/eclipse/rap/ui/internal/launch/RAPLaunchConfig.java	8 Jul 2011 12:53:31 -0000	1.13
>+++ src/org/eclipse/rap/ui/internal/launch/RAPLaunchConfig.java	8 Jul 2011 14:47:39 -0000
>@@ -117,8 +117,6 @@
>     = PREFIX + "servletName"; //$NON-NLS-1$
>   public static final String ENTRY_POINT
>     = PREFIX + "entryPoint"; //$NON-NLS-1$
>-  public static final String TERMINATE_PREVIOUS
>-    = PREFIX + "terminatePrevious"; //$NON-NLS-1$
>   public static final String OPEN_BROWSER
>     = PREFIX + "openBrowser"; //$NON-NLS-1$
>   public static final String BROWSER_MODE
>@@ -145,7 +143,6 @@
>   // Default values for launch configuration attribute names
>   private static final String DEFAULT_SERVLET_NAME = "rap"; //$NON-NLS-1$
>   private static final String DEFAULT_ENTRY_POINT = ""; //$NON-NLS-1$
>-  private static final boolean DEFAULT_TERMINATE_PREVIOUS = true;
>   private static final BrowserMode DEFAULT_BROWSER_MODE = BrowserMode.INTERNAL;
>   private static final int DEFAULT_PORT = 10080;
>   private static final boolean DEFAULT_USE_MANUAL_PORT = false;
>@@ -161,7 +158,6 @@
>   public static void setDefaults( ILaunchConfigurationWorkingCopy config ) {
>     config.setAttribute( SERVLET_NAME, DEFAULT_SERVLET_NAME );
>     config.setAttribute( ENTRY_POINT, DEFAULT_ENTRY_POINT );
>-    config.setAttribute( TERMINATE_PREVIOUS, DEFAULT_TERMINATE_PREVIOUS );
>     config.setAttribute( BROWSER_MODE, DEFAULT_BROWSER_MODE.getName() );
>     config.setAttribute( PORT, DEFAULT_PORT );
>     config.setAttribute( USE_MANUAL_PORT, DEFAULT_USE_MANUAL_PORT );
>@@ -271,16 +267,6 @@
>     workingCopy.setAttribute( ENTRY_POINT, entryPoint );
>   }
> 
>-  public boolean getTerminatePrevious() throws CoreException {
>-    return config.getAttribute( TERMINATE_PREVIOUS,
>-                                DEFAULT_TERMINATE_PREVIOUS );
>-  }
>-
>-  public void setTerminatePrevious( final boolean terminatePrevious ) {
>-    checkWorkingCopy();
>-    workingCopy.setAttribute( TERMINATE_PREVIOUS, terminatePrevious );
>-  }
>-
>   public boolean getOpenBrowser() throws CoreException {
>     return config.getAttribute( OPEN_BROWSER, true );
>   }
>Index: src/org/eclipse/rap/ui/internal/launch/RAPLaunchDelegate.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/tooling/org.eclipse.rap.ui.launch/src/org/eclipse/rap/ui/internal/launch/RAPLaunchDelegate.java,v
>retrieving revision 1.33
>diff -u -r1.33 RAPLaunchDelegate.java
>--- src/org/eclipse/rap/ui/internal/launch/RAPLaunchDelegate.java	8 Jul 2011 12:53:31 -0000	1.33
>+++ src/org/eclipse/rap/ui/internal/launch/RAPLaunchDelegate.java	8 Jul 2011 14:47:40 -0000
>@@ -279,17 +279,15 @@
>   private void terminateIfRunning( final IProgressMonitor monitor ) 
>     throws CoreException 
>   {
>-    if( config.getTerminatePrevious() ) {
>-      String taskName = LaunchMessages.RAPLaunchDelegate_TerminatePreviousTaskName;
>-      monitor.beginTask( taskName, IProgressMonitor.UNKNOWN );
>-      try {
>-        final ILaunch runningLaunch = findRunning();
>-        if( runningLaunch != null ) {
>-          terminate( runningLaunch );
>-        }
>-      } finally {
>-        monitor.done();
>+    String taskName = LaunchMessages.RAPLaunchDelegate_TerminatePreviousTaskName;
>+    monitor.beginTask( taskName, IProgressMonitor.UNKNOWN );
>+    try {
>+      final ILaunch runningLaunch = findRunning();
>+      if( runningLaunch != null ) {
>+        terminate( runningLaunch );
>       }
>+    } finally {
>+      monitor.done();
>     }
>   }
> 
>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.16
>diff -u -r1.16 messages.properties
>--- src/org/eclipse/rap/ui/internal/launch/messages.properties	8 Jul 2011 12:53:31 -0000	1.16
>+++ src/org/eclipse/rap/ui/internal/launch/messages.properties	8 Jul 2011 14:47:40 -0000
>@@ -71,4 +71,3 @@
> MainTab_RuntimeSettings=Runtime Settings
> MainTab_ServletAndEntryPoint=Servlet and Entry Point to Run
> MainTab_ServletName=&Servlet Name
>-MainTab_TerminatePrevious=Terminate possibly running previous launch
>Index: src/org/eclipse/rap/ui/internal/launch/tab/MainTab.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/tooling/org.eclipse.rap.ui.launch/src/org/eclipse/rap/ui/internal/launch/tab/MainTab.java,v
>retrieving revision 1.25
>diff -u -r1.25 MainTab.java
>--- src/org/eclipse/rap/ui/internal/launch/tab/MainTab.java	8 Jul 2011 12:53:31 -0000	1.25
>+++ src/org/eclipse/rap/ui/internal/launch/tab/MainTab.java	8 Jul 2011 14:47:41 -0000
>@@ -46,7 +46,6 @@
>   private final Image warnImage;
>   private Text servletNameTextField;
>   private Text entryPointTextField;
>-  private Button terminatePreviousCheckBox;
>   private Button openBrowserCheckBox;
>   private Button internalBrowserRadioButton;
>   private Button externalBrowserRadioButton;
>@@ -124,7 +123,6 @@
>     try {
>       servletNameTextField.setText( rapConfig.getServletName() );
>       entryPointTextField.setText( rapConfig.getEntryPoint() );
>-      terminatePreviousCheckBox.setSelection( rapConfig.getTerminatePrevious() );
>       manualPortCheckBox.setSelection( rapConfig.getUseManualPort() );
>       portSpinner.setSelection( rapConfig.getPort() );
>       contextPathCheckBox.setSelection( rapConfig.getUseManualContextPath() );
>@@ -155,7 +153,6 @@
>     RAPLaunchConfig rapConfig = new RAPLaunchConfig( config );
>     rapConfig.setServletName( servletNameTextField.getText() );
>     rapConfig.setEntryPoint( entryPointTextField.getText() );
>-    rapConfig.setTerminatePrevious( terminatePreviousCheckBox.getSelection() );
>     rapConfig.setOpenBrowser( openBrowserCheckBox.getSelection() );
>     rapConfig.setBrowserMode( getBrowserMode() );
>     portSpinner.setEnabled( manualPortCheckBox.getSelection() );
>@@ -230,7 +227,6 @@
>     group.setText( LaunchMessages.MainTab_ServletAndEntryPoint );
>     createServletNamePart( group );
>     createEntryPointPart( group );
>-    createSessionPart( group );
>   }
> 
>   private void createServletNamePart( Composite parent ) {
>@@ -263,14 +259,6 @@
>     } );
>   }
> 
>-  private void createSessionPart( Composite parent ) {
>-    terminatePreviousCheckBox = new Button( parent, SWT.CHECK );
>-    terminatePreviousCheckBox.setLayoutData( spanHorizontal( 3, 0 ) );
>-    String text = LaunchMessages.MainTab_TerminatePrevious;
>-    terminatePreviousCheckBox.setText( text );
>-    terminatePreviousCheckBox.addSelectionListener( selectionListener );
>-  }
>-  
>   private void createBrowserModeSection( Composite parent ) {
>     Group group = new Group( parent, SWT.NONE );
>     group.setLayoutData( fillHorizontal.create() );
>#P org.eclipse.rap.ui.tests
>Index: src/org/eclipse/rap/ui/internal/launch/RAPLaunchConfig_Test.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/tooling/org.eclipse.rap.ui.tests/src/org/eclipse/rap/ui/internal/launch/RAPLaunchConfig_Test.java,v
>retrieving revision 1.6
>diff -u -r1.6 RAPLaunchConfig_Test.java
>--- src/org/eclipse/rap/ui/internal/launch/RAPLaunchConfig_Test.java	8 Jul 2011 12:53:30 -0000	1.6
>+++ src/org/eclipse/rap/ui/internal/launch/RAPLaunchConfig_Test.java	8 Jul 2011 14:47:43 -0000
>@@ -35,7 +35,6 @@
>   
>   public void testInitialValues() throws CoreException {
>     assertFalse( rapConfig.getUseManualPort() );
>-    assertTrue( rapConfig.getTerminatePrevious() );
>     assertFalse( "".equals( rapConfig.getServletName() ) );
>     assertTrue( "".equals( rapConfig.getEntryPoint() ) );
>     assertEquals( LibraryVariant.STANDARD, rapConfig.getLibraryVariant() );

Actions: View | Diff

Attachments on bug 351073: 199323 | 199338