Attachment #199323 for bug #351073

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

Lines 77-83 Link Here

(-)src/org/eclipse/rap/ui/internal/launch/LaunchMessages.java (-1 lines)
77	public static String MainTab_RuntimeSettings;	77	public static String MainTab_RuntimeSettings;
78	public static String MainTab_ServletAndEntryPoint;	78	public static String MainTab_ServletAndEntryPoint;
79	public static String MainTab_ServletName;	79	public static String MainTab_ServletName;
80	public static String MainTab_TerminatePrevious;
81	public static String ServletNameSelectionDialog_Message;	80	public static String ServletNameSelectionDialog_Message;
82	public static String ServletNameSelectionDialog_Searching;	81	public static String ServletNameSelectionDialog_Searching;
83	public static String ServletNameSelectionDialog_Title;	82	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 83-86 Link Here

(-)src/org/eclipse/rap/ui/internal/launch/messages.properties (-1 lines)
83	MainTab_RuntimeSettings=Runtime Settings	83	MainTab_RuntimeSettings=Runtime Settings
84	MainTab_ServletAndEntryPoint=Servlet and Entry Point to Run	84	MainTab_ServletAndEntryPoint=Servlet and Entry Point to Run
85	MainTab_ServletName=&Servlet Name	85	MainTab_ServletName=&Servlet Name
86	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 37-43 Link Here

(-)src/org/eclipse/rap/ui/internal/launch/RAPLaunchConfig_Test.java (-1 lines)
37		37
38	public void testInitialValues() throws CoreException {	38	public void testInitialValues() throws CoreException {
39	assertFalse( rapConfig.getUseManualPort() );	39	assertFalse( rapConfig.getUseManualPort() );
40	assertTrue( rapConfig.getTerminatePrevious() );
41	assertFalse( "".equals( rapConfig.getServletName() ) );	40	assertFalse( "".equals( rapConfig.getServletName() ) );
42	assertTrue( "".equals( rapConfig.getEntryPoint() ) );	41	assertTrue( "".equals( rapConfig.getEntryPoint() ) );
43	assertEquals( Level.OFF, rapConfig.getLogLevel() );	42	assertEquals( Level.OFF, rapConfig.getLogLevel() );

Return to bug 351073

Lines 282-298 Link Here

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

Lines 129-136 Link Here

(-)src/org/eclipse/rap/ui/internal/launch/RAPLaunchConfig.java (-14 lines)
129	= PREFIX + "servletName"; //$NON-NLS-1$	129	= PREFIX + "servletName"; //$NON-NLS-1$
130	public static final String ENTRY_POINT	130	public static final String ENTRY_POINT
131	= PREFIX + "entryPoint"; //$NON-NLS-1$	131	= PREFIX + "entryPoint"; //$NON-NLS-1$
132	public static final String TERMINATE_PREVIOUS
133	= PREFIX + "terminatePrevious"; //$NON-NLS-1$
134	public static final String OPEN_BROWSER	132	public static final String OPEN_BROWSER
135	= PREFIX + "openBrowser"; //$NON-NLS-1$	133	= PREFIX + "openBrowser"; //$NON-NLS-1$
136	public static final String BROWSER_MODE	134	public static final String BROWSER_MODE
Lines 159-165 Link Here
159	// Default values for launch configuration attribute names	157	// Default values for launch configuration attribute names
160	private static final String DEFAULT_SERVLET_NAME = "rap"; //$NON-NLS-1$	158	private static final String DEFAULT_SERVLET_NAME = "rap"; //$NON-NLS-1$
161	private static final String DEFAULT_ENTRY_POINT = ""; //$NON-NLS-1$	159	private static final String DEFAULT_ENTRY_POINT = ""; //$NON-NLS-1$
162	private static final boolean DEFAULT_TERMINATE_PREVIOUS = true;
163	private static final BrowserMode DEFAULT_BROWSER_MODE = BrowserMode.INTERNAL;	160	private static final BrowserMode DEFAULT_BROWSER_MODE = BrowserMode.INTERNAL;
164	private static final int DEFAULT_PORT = 10080;	161	private static final int DEFAULT_PORT = 10080;
165	private static final boolean DEFAULT_USE_MANUAL_PORT = false;	162	private static final boolean DEFAULT_USE_MANUAL_PORT = false;
Lines 176-182 Link Here
176	public static void setDefaults( ILaunchConfigurationWorkingCopy config ) {	173	public static void setDefaults( ILaunchConfigurationWorkingCopy config ) {
177	config.setAttribute( SERVLET_NAME, DEFAULT_SERVLET_NAME );	174	config.setAttribute( SERVLET_NAME, DEFAULT_SERVLET_NAME );
178	config.setAttribute( ENTRY_POINT, DEFAULT_ENTRY_POINT );	175	config.setAttribute( ENTRY_POINT, DEFAULT_ENTRY_POINT );
179	config.setAttribute( TERMINATE_PREVIOUS, DEFAULT_TERMINATE_PREVIOUS );
180	config.setAttribute( BROWSER_MODE, DEFAULT_BROWSER_MODE.getName() );	176	config.setAttribute( BROWSER_MODE, DEFAULT_BROWSER_MODE.getName() );
181	config.setAttribute( PORT, DEFAULT_PORT );	177	config.setAttribute( PORT, DEFAULT_PORT );
182	config.setAttribute( USE_MANUAL_PORT, DEFAULT_USE_MANUAL_PORT );	178	config.setAttribute( USE_MANUAL_PORT, DEFAULT_USE_MANUAL_PORT );
Lines 287-302 Link Here
287	workingCopy.setAttribute( ENTRY_POINT, entryPoint );	283	workingCopy.setAttribute( ENTRY_POINT, entryPoint );
288	}	284	}
289		285
290	public boolean getTerminatePrevious() throws CoreException {
291	return config.getAttribute( TERMINATE_PREVIOUS,
292	DEFAULT_TERMINATE_PREVIOUS );
293	}
294
295	public void setTerminatePrevious( final boolean terminatePrevious ) {
296	checkWorkingCopy();
297	workingCopy.setAttribute( TERMINATE_PREVIOUS, terminatePrevious );
298	}
299
300	public boolean getOpenBrowser() throws CoreException {	286	public boolean getOpenBrowser() throws CoreException {
301	return config.getAttribute( OPEN_BROWSER, true );	287	return config.getAttribute( OPEN_BROWSER, true );
302	}	288	}

Lines 51-57 Link Here

(-)src/org/eclipse/rap/ui/internal/launch/tab/MainTab.java (-12 lines)
51	private final Image warnImage;	51	private final Image warnImage;
52	private Text servletNameTextField;	52	private Text servletNameTextField;
53	private Text entryPointTextField;	53	private Text entryPointTextField;
54	private Button terminatePreviousCheckBox;
55	private Button openBrowserCheckBox;	54	private Button openBrowserCheckBox;
56	private Button internalBrowserRadioButton;	55	private Button internalBrowserRadioButton;
57	private Button externalBrowserRadioButton;	56	private Button externalBrowserRadioButton;
Lines 130-136 Link Here
130	try {	129	try {
131	servletNameTextField.setText( rapConfig.getServletName() );	130	servletNameTextField.setText( rapConfig.getServletName() );
132	entryPointTextField.setText( rapConfig.getEntryPoint() );	131	entryPointTextField.setText( rapConfig.getEntryPoint() );
133	terminatePreviousCheckBox.setSelection( rapConfig.getTerminatePrevious() );
134	manualPortCheckBox.setSelection( rapConfig.getUseManualPort() );	132	manualPortCheckBox.setSelection( rapConfig.getUseManualPort() );
135	portSpinner.setSelection( rapConfig.getPort() );	133	portSpinner.setSelection( rapConfig.getPort() );
136	contextPathCheckBox.setSelection( rapConfig.getUseManualContextPath() );	134	contextPathCheckBox.setSelection( rapConfig.getUseManualContextPath() );
Lines 164-170 Link Here
164	RAPLaunchConfig rapConfig = new RAPLaunchConfig( config );	162	RAPLaunchConfig rapConfig = new RAPLaunchConfig( config );
165	rapConfig.setServletName( servletNameTextField.getText() );	163	rapConfig.setServletName( servletNameTextField.getText() );
166	rapConfig.setEntryPoint( entryPointTextField.getText() );	164	rapConfig.setEntryPoint( entryPointTextField.getText() );
167	rapConfig.setTerminatePrevious( terminatePreviousCheckBox.getSelection() );
168	rapConfig.setOpenBrowser( openBrowserCheckBox.getSelection() );	165	rapConfig.setOpenBrowser( openBrowserCheckBox.getSelection() );
169	rapConfig.setBrowserMode( getBrowserMode() );	166	rapConfig.setBrowserMode( getBrowserMode() );
170	portSpinner.setEnabled( manualPortCheckBox.getSelection() );	167	portSpinner.setEnabled( manualPortCheckBox.getSelection() );
Lines 240-246 Link Here
240	group.setText( LaunchMessages.MainTab_ServletAndEntryPoint );	237	group.setText( LaunchMessages.MainTab_ServletAndEntryPoint );
241	createServletNamePart( group );	238	createServletNamePart( group );
242	createEntryPointPart( group );	239	createEntryPointPart( group );
243	createSessionPart( group );
244	}	240	}
245		241
246	private void createServletNamePart( Composite parent ) {	242	private void createServletNamePart( Composite parent ) {
Lines 273-286 Link Here
273	} );	269	} );
274	}	270	}
275		271
276	private void createSessionPart( Composite parent ) {
277	terminatePreviousCheckBox = new Button( parent, SWT.CHECK );
278	terminatePreviousCheckBox.setLayoutData( spanHorizontal( 3, 0 ) );
279	String text = LaunchMessages.MainTab_TerminatePrevious;
280	terminatePreviousCheckBox.setText( text );
281	terminatePreviousCheckBox.addSelectionListener( selectionListener );
282	}
283
284	private void createBrowserModeSection( Composite parent ) {	272	private void createBrowserModeSection( Composite parent ) {
285	Group group = new Group( parent, SWT.NONE );	273	Group group = new Group( parent, SWT.NONE );
286	group.setLayoutData( fillHorizontal.create() );	274	group.setLayoutData( fillHorizontal.create() );