Attachment #199338 for bug #351073

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

Lines 65-71 Link Here

(-)src/org/eclipse/rap/ui/internal/launch/LaunchMessages.java (-1 lines)
65	public static String MainTab_RuntimeSettings;	65	public static String MainTab_RuntimeSettings;
66	public static String MainTab_ServletAndEntryPoint;	66	public static String MainTab_ServletAndEntryPoint;
67	public static String MainTab_ServletName;	67	public static String MainTab_ServletName;
68	public static String MainTab_TerminatePrevious;
69	public static String ServletNameSelectionDialog_Message;	68	public static String ServletNameSelectionDialog_Message;
70	public static String ServletNameSelectionDialog_Searching;	69	public static String ServletNameSelectionDialog_Searching;
71	public static String ServletNameSelectionDialog_Title;	70	public static String ServletNameSelectionDialog_Title;




    = 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

  // 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;

  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 );

    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 );
  }




  private void terminateIfRunning( final IProgressMonitor monitor ) 
    throws CoreException 
  {
    String taskName = LaunchMessages.RAPLaunchDelegate_TerminatePreviousTaskName;
    monitor.beginTask( taskName, IProgressMonitor.UNKNOWN );
    try {
      final ILaunch runningLaunch = findRunning();
      if( runningLaunch != null ) {
        terminate( runningLaunch );
          terminate( runningLaunch );
        }
      } finally {
        monitor.done();
      }
    } finally {
      monitor.done();
    }
  }


Lines 71-74 Link Here

(-)src/org/eclipse/rap/ui/internal/launch/messages.properties (-1 lines)
71	MainTab_RuntimeSettings=Runtime Settings	71	MainTab_RuntimeSettings=Runtime Settings
72	MainTab_ServletAndEntryPoint=Servlet and Entry Point to Run	72	MainTab_ServletAndEntryPoint=Servlet and Entry Point to Run
73	MainTab_ServletName=&Servlet Name	73	MainTab_ServletName=&Servlet Name
74	MainTab_TerminatePrevious=Terminate possibly running previous launch




  private final Image warnImage;
  private Text servletNameTextField;
  private Text entryPointTextField;
  private Button terminatePreviousCheckBox;
  private Button openBrowserCheckBox;
  private Button internalBrowserRadioButton;
  private Button externalBrowserRadioButton;

    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() );

    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() );

    group.setText( LaunchMessages.MainTab_ServletAndEntryPoint );
    createServletNamePart( group );
    createEntryPointPart( group );
    createSessionPart( group );
  }

  private void createServletNamePart( Composite parent ) {

    } );
  }

  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() );

Lines 35-41 Link Here

(-)src/org/eclipse/rap/ui/internal/launch/RAPLaunchConfig_Test.java (-1 lines)
35		35
36	public void testInitialValues() throws CoreException {	36	public void testInitialValues() throws CoreException {
37	assertFalse( rapConfig.getUseManualPort() );	37	assertFalse( rapConfig.getUseManualPort() );
38	assertTrue( rapConfig.getTerminatePrevious() );
39	assertFalse( "".equals( rapConfig.getServletName() ) );	38	assertFalse( "".equals( rapConfig.getServletName() ) );
40	assertTrue( "".equals( rapConfig.getEntryPoint() ) );	39	assertTrue( "".equals( rapConfig.getEntryPoint() ) );
41	assertEquals( LibraryVariant.STANDARD, rapConfig.getLibraryVariant() );	40	assertEquals( LibraryVariant.STANDARD, rapConfig.getLibraryVariant() );

Return to bug 351073

Lines 279-295 Link Here

(-)src/org/eclipse/rap/ui/internal/launch/RAPLaunchDelegate.java (-10 / +8 lines)
279	private void terminateIfRunning( final IProgressMonitor monitor )	279	private void terminateIfRunning( final IProgressMonitor monitor )
280	throws CoreException	280	throws CoreException
281	{	281	{
282	if( config.getTerminatePrevious() ) {	282	String taskName = LaunchMessages.RAPLaunchDelegate_TerminatePreviousTaskName;
283	String taskName = LaunchMessages.RAPLaunchDelegate_TerminatePreviousTaskName;	283	monitor.beginTask( taskName, IProgressMonitor.UNKNOWN );
284	monitor.beginTask( taskName, IProgressMonitor.UNKNOWN );	284	try {
285	try {	285	final ILaunch runningLaunch = findRunning();
286	final ILaunch runningLaunch = findRunning();	286	if( runningLaunch != null ) {
287	if( runningLaunch != null ) {	287	terminate( runningLaunch );
288	terminate( runningLaunch );
289	}
290	} finally {
291	monitor.done();
292	}	288	}
		289	} finally {
		290	monitor.done();
293	}	291	}
294	}	292	}
295		293

Lines 117-124 Link Here

(-)src/org/eclipse/rap/ui/internal/launch/RAPLaunchConfig.java (-14 lines)
117	= PREFIX + "servletName"; //$NON-NLS-1$	117	= PREFIX + "servletName"; //$NON-NLS-1$
118	public static final String ENTRY_POINT	118	public static final String ENTRY_POINT
119	= PREFIX + "entryPoint"; //$NON-NLS-1$	119	= PREFIX + "entryPoint"; //$NON-NLS-1$
120	public static final String TERMINATE_PREVIOUS
121	= PREFIX + "terminatePrevious"; //$NON-NLS-1$
122	public static final String OPEN_BROWSER	120	public static final String OPEN_BROWSER
123	= PREFIX + "openBrowser"; //$NON-NLS-1$	121	= PREFIX + "openBrowser"; //$NON-NLS-1$
124	public static final String BROWSER_MODE	122	public static final String BROWSER_MODE
Lines 145-151 Link Here
145	// Default values for launch configuration attribute names	143	// Default values for launch configuration attribute names
146	private static final String DEFAULT_SERVLET_NAME = "rap"; //$NON-NLS-1$	144	private static final String DEFAULT_SERVLET_NAME = "rap"; //$NON-NLS-1$
147	private static final String DEFAULT_ENTRY_POINT = ""; //$NON-NLS-1$	145	private static final String DEFAULT_ENTRY_POINT = ""; //$NON-NLS-1$
148	private static final boolean DEFAULT_TERMINATE_PREVIOUS = true;
149	private static final BrowserMode DEFAULT_BROWSER_MODE = BrowserMode.INTERNAL;	146	private static final BrowserMode DEFAULT_BROWSER_MODE = BrowserMode.INTERNAL;
150	private static final int DEFAULT_PORT = 10080;	147	private static final int DEFAULT_PORT = 10080;
151	private static final boolean DEFAULT_USE_MANUAL_PORT = false;	148	private static final boolean DEFAULT_USE_MANUAL_PORT = false;
Lines 161-167 Link Here
161	public static void setDefaults( ILaunchConfigurationWorkingCopy config ) {	158	public static void setDefaults( ILaunchConfigurationWorkingCopy config ) {
162	config.setAttribute( SERVLET_NAME, DEFAULT_SERVLET_NAME );	159	config.setAttribute( SERVLET_NAME, DEFAULT_SERVLET_NAME );
163	config.setAttribute( ENTRY_POINT, DEFAULT_ENTRY_POINT );	160	config.setAttribute( ENTRY_POINT, DEFAULT_ENTRY_POINT );
164	config.setAttribute( TERMINATE_PREVIOUS, DEFAULT_TERMINATE_PREVIOUS );
165	config.setAttribute( BROWSER_MODE, DEFAULT_BROWSER_MODE.getName() );	161	config.setAttribute( BROWSER_MODE, DEFAULT_BROWSER_MODE.getName() );
166	config.setAttribute( PORT, DEFAULT_PORT );	162	config.setAttribute( PORT, DEFAULT_PORT );
167	config.setAttribute( USE_MANUAL_PORT, DEFAULT_USE_MANUAL_PORT );	163	config.setAttribute( USE_MANUAL_PORT, DEFAULT_USE_MANUAL_PORT );
Lines 271-286 Link Here
271	workingCopy.setAttribute( ENTRY_POINT, entryPoint );	267	workingCopy.setAttribute( ENTRY_POINT, entryPoint );
272	}	268	}
273		269
274	public boolean getTerminatePrevious() throws CoreException {
275	return config.getAttribute( TERMINATE_PREVIOUS,
276	DEFAULT_TERMINATE_PREVIOUS );
277	}
278
279	public void setTerminatePrevious( final boolean terminatePrevious ) {
280	checkWorkingCopy();
281	workingCopy.setAttribute( TERMINATE_PREVIOUS, terminatePrevious );
282	}
283
284	public boolean getOpenBrowser() throws CoreException {	270	public boolean getOpenBrowser() throws CoreException {
285	return config.getAttribute( OPEN_BROWSER, true );	271	return config.getAttribute( OPEN_BROWSER, true );
286	}	272	}

Lines 46-52 Link Here

(-)src/org/eclipse/rap/ui/internal/launch/tab/MainTab.java (-12 lines)
46	private final Image warnImage;	46	private final Image warnImage;
47	private Text servletNameTextField;	47	private Text servletNameTextField;
48	private Text entryPointTextField;	48	private Text entryPointTextField;
49	private Button terminatePreviousCheckBox;
50	private Button openBrowserCheckBox;	49	private Button openBrowserCheckBox;
51	private Button internalBrowserRadioButton;	50	private Button internalBrowserRadioButton;
52	private Button externalBrowserRadioButton;	51	private Button externalBrowserRadioButton;
Lines 124-130 Link Here
124	try {	123	try {
125	servletNameTextField.setText( rapConfig.getServletName() );	124	servletNameTextField.setText( rapConfig.getServletName() );
126	entryPointTextField.setText( rapConfig.getEntryPoint() );	125	entryPointTextField.setText( rapConfig.getEntryPoint() );
127	terminatePreviousCheckBox.setSelection( rapConfig.getTerminatePrevious() );
128	manualPortCheckBox.setSelection( rapConfig.getUseManualPort() );	126	manualPortCheckBox.setSelection( rapConfig.getUseManualPort() );
129	portSpinner.setSelection( rapConfig.getPort() );	127	portSpinner.setSelection( rapConfig.getPort() );
130	contextPathCheckBox.setSelection( rapConfig.getUseManualContextPath() );	128	contextPathCheckBox.setSelection( rapConfig.getUseManualContextPath() );
Lines 155-161 Link Here
155	RAPLaunchConfig rapConfig = new RAPLaunchConfig( config );	153	RAPLaunchConfig rapConfig = new RAPLaunchConfig( config );
156	rapConfig.setServletName( servletNameTextField.getText() );	154	rapConfig.setServletName( servletNameTextField.getText() );
157	rapConfig.setEntryPoint( entryPointTextField.getText() );	155	rapConfig.setEntryPoint( entryPointTextField.getText() );
158	rapConfig.setTerminatePrevious( terminatePreviousCheckBox.getSelection() );
159	rapConfig.setOpenBrowser( openBrowserCheckBox.getSelection() );	156	rapConfig.setOpenBrowser( openBrowserCheckBox.getSelection() );
160	rapConfig.setBrowserMode( getBrowserMode() );	157	rapConfig.setBrowserMode( getBrowserMode() );
161	portSpinner.setEnabled( manualPortCheckBox.getSelection() );	158	portSpinner.setEnabled( manualPortCheckBox.getSelection() );
Lines 230-236 Link Here
230	group.setText( LaunchMessages.MainTab_ServletAndEntryPoint );	227	group.setText( LaunchMessages.MainTab_ServletAndEntryPoint );
231	createServletNamePart( group );	228	createServletNamePart( group );
232	createEntryPointPart( group );	229	createEntryPointPart( group );
233	createSessionPart( group );
234	}	230	}
235		231
236	private void createServletNamePart( Composite parent ) {	232	private void createServletNamePart( Composite parent ) {
Lines 263-276 Link Here
263	} );	259	} );
264	}	260	}
265		261
266	private void createSessionPart( Composite parent ) {
267	terminatePreviousCheckBox = new Button( parent, SWT.CHECK );
268	terminatePreviousCheckBox.setLayoutData( spanHorizontal( 3, 0 ) );
269	String text = LaunchMessages.MainTab_TerminatePrevious;
270	terminatePreviousCheckBox.setText( text );
271	terminatePreviousCheckBox.addSelectionListener( selectionListener );
272	}
273
274	private void createBrowserModeSection( Composite parent ) {	262	private void createBrowserModeSection( Composite parent ) {
275	Group group = new Group( parent, SWT.NONE );	263	Group group = new Group( parent, SWT.NONE );
276	group.setLayoutData( fillHorizontal.create() );	264	group.setLayoutData( fillHorizontal.create() );