Attachment 195331 Details for Bug 345403 – text descriptions updated

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

[patch] text descriptions updated

345403_v1.patch (text/plain), 12.76 KB, created by Beyhan Veliev

on 2011-05-11 07:44:17 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Beyhan Veliev

Created: 2011-05-11 07:44:17 EDT

Size: 12.76 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.ui.intro
>Index: src/org/eclipse/rap/ui/internal/intro/target/InstallTargetDialog.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/tooling/org.eclipse.rap.ui.intro/src/org/eclipse/rap/ui/internal/intro/target/InstallTargetDialog.java,v
>retrieving revision 1.5
>diff -u -r1.5 InstallTargetDialog.java
>--- src/org/eclipse/rap/ui/internal/intro/target/InstallTargetDialog.java	10 Feb 2011 10:26:34 -0000	1.5
>+++ src/org/eclipse/rap/ui/internal/intro/target/InstallTargetDialog.java	11 May 2011 11:41:32 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2007, 2011 Innoopract Informationssysteme GmbH.
>+ * Copyright (c) 2007, 2011 EclipseSource and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -19,7 +19,8 @@
> import org.eclipse.swt.events.SelectionEvent;
> import org.eclipse.swt.graphics.Image;
> import org.eclipse.swt.graphics.Point;
>-import org.eclipse.swt.layout.*;
>+import org.eclipse.swt.layout.GridData;
>+import org.eclipse.swt.layout.GridLayout;
> import org.eclipse.swt.widgets.*;
> 
> public final class InstallTargetDialog extends TitleAreaDialog {
>@@ -37,7 +38,7 @@
>   private boolean shouldSwitchTarget = true;
>   private Image titleImage;
> 
>-  public InstallTargetDialog( final Shell parentShell ) {
>+  public InstallTargetDialog( Shell parentShell ) {
>     super( parentShell );
>     setShellStyle( SWT.TITLE | SWT.CLOSE | SWT.RESIZE );
>     setHelpAvailable( false );
>@@ -63,12 +64,13 @@
> 
>   protected Point getInitialSize() {
>     Point initialSize = super.getInitialSize();
>-    return new Point( initialSize.x, initialSize.y - 160 );
>+    return new Point( initialSize.x, initialSize.y - 150 );
>   }
>   
>-  protected Control createDialogArea( final Composite parent ) {
>+  protected Control createDialogArea( Composite parent ) {
>     Composite result = ( Composite )super.createDialogArea( parent );
>     configureDialog();
>+    createTargetDescription( result );
>     createTargetLocationArea( result );
>     createSwitchTargetArea( result );
>     Dialog.applyDialogFont( result );
>@@ -96,31 +98,34 @@
>     setMessage( IntroMessages.InstallDialog_Message_selectLocation );
>   }
> 
>-  private void createTargetLocationArea( final Composite parent ) {
>+  private void createTargetDescription( Composite parent ) {
>+    Composite container = new Composite( parent, SWT.NONE );
>+    container.setLayoutData( new GridData( SWT.FILL, SWT.TOP, true, false ) );
>+    container.setLayout( new GridLayout() );
>+    Label targetDescriptionLabel = new Label( container, SWT.WRAP );
>+    targetDescriptionLabel.setLayoutData( getLayoutDataForDescriptions() );
>+    targetDescriptionLabel.setText( IntroMessages.InstallTargetDialog_TargetDescriptionMsg );
>+  }
>+  
>+  private void createTargetLocationArea( Composite parent ) {
>     Composite container = new Composite( parent, SWT.NONE );
>     container.setLayoutData( new GridData( SWT.FILL, SWT.TOP, true, false ) );
>     container.setLayout( new GridLayout() );
>     Group targetSelectionGroup = new Group( container, SWT.NONE );
>     targetSelectionGroup.setLayout( new GridLayout( 1, true ) );
>-    targetSelectionGroup.setLayoutData( new GridData( SWT.FILL,
>-                                                      SWT.TOP,
>-                                                      true,
>-                                                      false ) );
>-    String targetVersionGroupTitle 
>-      = IntroMessages.InstallTargetDialog_TargetVersionGroupTitle;
>+    targetSelectionGroup.setLayoutData( new GridData( SWT.FILL, SWT.TOP, true, false ) );
>+    String targetVersionGroupTitle = IntroMessages.InstallTargetDialog_TargetVersionGroupTitle;
>     targetSelectionGroup.setText( targetVersionGroupTitle );
>     createButtons( targetSelectionGroup );
>-    Label warningLabel = new Label( targetSelectionGroup, SWT.NONE );
>-    warningLabel.setText( IntroMessages.InstallTargetDialog_DownloadWarningMsg );
>   }
> 
>-  private void createButtons( final Group targetSelectionGroup ) {
>+  private void createButtons( Group targetSelectionGroup ) {
>     Button latestStableBuildBtn = new Button( targetSelectionGroup, SWT.RADIO );
>     String latestBuildText = IntroMessages.InstallTargetDialog_LatestBuildText;
>     latestStableBuildBtn.setText( latestBuildText );
>     latestStableBuildBtn.setSelection( true );
>     latestStableBuildBtn.addSelectionListener( new SelectionAdapter() {
>-      public void widgetSelected( final SelectionEvent e ) {
>+      public void widgetSelected( SelectionEvent e ) {
>         isLatestBuild = true;
>       }
>     } );
>@@ -129,34 +134,37 @@
>       = IntroMessages.InstallTargetDialog_LatestReleaseText;
>     latestReleaseBtn.setText( latestReleaseText );
>     latestReleaseBtn.addSelectionListener( new SelectionAdapter() {
>-      public void widgetSelected( final SelectionEvent e ) {
>+      public void widgetSelected( SelectionEvent e ) {
>         isLatestBuild = false;
>       }
>     } );
>   }
> 
>-  private void createSwitchTargetArea( final Composite parent ) {
>+  private void createSwitchTargetArea( Composite parent ) {
>     Composite container = new Composite( parent, SWT.NONE );
>+    container.setLayout( new GridLayout() );
>     container.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, false ) );
>-    FillLayout layout = new FillLayout();
>-    layout.marginWidth = 5;
>-    layout.marginHeight = 5;
>-    container.setLayout( layout );
>     Group grgTarget = new Group( container, SWT.NONE );
>     grgTarget.setLayout( new GridLayout() );
>+    grgTarget.setLayoutData( new GridData( SWT.FILL, SWT.TOP, true, false ) );
>     grgTarget.setText( IntroMessages.InstallDialog_TargetGroup );
>     final Button switchTarget = new Button( grgTarget, SWT.CHECK );
>     switchTarget.setText( IntroMessages.InstallDialog_switchTarget );
>     switchTarget.setSelection( true );
>     switchTarget.addSelectionListener( new SelectionAdapter() {
>-      public void widgetSelected( final SelectionEvent e ) {
>+      public void widgetSelected( SelectionEvent e ) {
>         shouldSwitchTarget = switchTarget.getSelection();
>       }
>     } );
>     Label lblDescription = new Label( grgTarget, SWT.WRAP );
>+    lblDescription.setLayoutData( getLayoutDataForDescriptions() );
>+    lblDescription.setText( IntroMessages.InstallDialog_TargetDescription );
>+  }
>+  
>+  private GridData getLayoutDataForDescriptions() {
>     GridData gridData = new GridData( GridData.FILL_HORIZONTAL );
>     gridData.widthHint = 120;
>-    lblDescription.setLayoutData( gridData );
>-    lblDescription.setText( IntroMessages.InstallDialog_TargetDescription );
>+    return gridData;
>   }
>+  
> }
>Index: src/org/eclipse/rap/ui/internal/intro/target/IntroMessages.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/tooling/org.eclipse.rap.ui.intro/src/org/eclipse/rap/ui/internal/intro/target/IntroMessages.java,v
>retrieving revision 1.8
>diff -u -r1.8 IntroMessages.java
>--- src/org/eclipse/rap/ui/internal/intro/target/IntroMessages.java	10 Feb 2011 10:26:33 -0000	1.8
>+++ src/org/eclipse/rap/ui/internal/intro/target/IntroMessages.java	11 May 2011 11:41:32 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2007, 2011 Innoopract Informationssysteme GmbH.
>+ * Copyright (c) 2007, 2011 EclipseSource and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -37,7 +37,7 @@
>   public static String InstallRAPTargetHandler_SwitchTargetFailed;
>   public static String InstallRAPTargetHandler_SwitchTargetInterrupted;
> 
>-  public static String InstallTargetDialog_DownloadWarningMsg;
>+  public static String InstallTargetDialog_TargetDescriptionMsg;
> 
>   public static String InstallTargetDialog_LatestBuildText;
> 
>Index: src/org/eclipse/rap/ui/internal/intro/target/messages.properties
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/tooling/org.eclipse.rap.ui.intro/src/org/eclipse/rap/ui/internal/intro/target/messages.properties,v
>retrieving revision 1.6
>diff -u -r1.6 messages.properties
>--- src/org/eclipse/rap/ui/internal/intro/target/messages.properties	10 Feb 2011 10:26:33 -0000	1.6
>+++ src/org/eclipse/rap/ui/internal/intro/target/messages.properties	11 May 2011 11:41:32 -0000
>@@ -1,5 +1,5 @@
> ###############################################################################
>-# Copyright (c) 2007, 2011 Innoopract Informationssysteme GmbH.
>+# Copyright (c) 2007, 2011 EclipseSource and others.
> # All rights reserved. This program and the accompanying materials
> # are made available under the terms of the Eclipse Public License v1.0
> # which accompanies this distribution, and is available at
>@@ -9,28 +9,27 @@
> #  Innoopract Informationssysteme GmbH - initial API and implementation
> #  EclipseSource - ongoing development
> ################################################################################
>-InstallDialog_ShellTitle=Target Platform Installation
>+InstallDialog_ShellTitle=RAP Target Platform Installation
> InstallDialog_validPath=You need to define a valid location for the target
>-InstallDialog_DialogTitle=Configure Target Platform Installation
>+InstallDialog_DialogTitle=Download and install a RAP target platform
> InstallDialog_Message_selectDirMsg=Select a directory in which the target platform should be installed.
> InstallDialog_Message_selectDirText=Select Direcetory
>-InstallDialog_Message_selectLocation=Select a RAP target version.
>+InstallDialog_Message_selectLocation=Select a version to install
> InstallDialog_Location=&Location:
> InstallDialog_Browse=&Browse...
>-InstallDialog_switchTarget=&Switch the target after installation (recommended)
>-InstallDialog_TargetDescription=RAP is a platform itself and cannot be \
>-  installed on top of an existing Eclipse installation. If you don't want \
>-  to switch the target now, you need to do it manually before writing \
>-  applications on top of RAP.\nIf you have projects in your workspace which \
>-  are compiled against RCP you may get compile errors after switching the \
>-  target.
>+InstallDialog_switchTarget=&Activate the target after installation (recommended)
>+InstallDialog_TargetDescription=If you don't activate the RAP target now, you can also do that \
>+  manually in the preferences.
> InstallDialog_TargetGroup=Target activation
> InstallRAPTargetAction_FailedExecuteCommand=Failed execute command: {0}
> InstallRAPTargetHandler_InstallFailed=Failed to install target platform.
> InstallRAPTargetHandler_InstallInterrupted=Installing target interrupted.
> InstallRAPTargetHandler_SwitchTargetFailed=Failed to switch to RAP target platform.
>-InstallRAPTargetHandler_SwitchTargetInterrupted=InterruptedException occured while switching to RAP target platform. 
>-InstallTargetDialog_DownloadWarningMsg=Target content will be downloaded and this can take a few minutes.
>+InstallRAPTargetHandler_SwitchTargetInterrupted=InterruptedException occured while switching \
>+  to RAP target platform. 
>+InstallTargetDialog_TargetDescriptionMsg=RAP applications have to be compiled against \
>+  a RAP target platform. This installer will download and install the latest RAP \
>+  target platform from the RAP repository.
> InstallTargetDialog_LatestBuildText=Latest stable build (latest features, recommended for development)
> InstallTargetDialog_LatestReleaseText=Latest release
> InstallTargetDialog_TargetVersionGroupTitle=Target selection
>@@ -40,6 +39,8 @@
> TargetProvider_InvalidTargetDest=Invalid target destination: {0}
> TargetProvider_SourceNotFound=Failed to resolve target platform source.
> TargetSwitcher_InvalidTargetRepository=Invalid P2 repository <{0}>
>-TargetSwitcher_NoInternetConnectionAvailableErrorMsg=No internet connection available. RAP target installation needs internet connection to download the target.
>+TargetSwitcher_NoInternetConnectionAvailableErrorMsg=No internet connection available. RAP \
>+  target installation needs internet connection to download the target.
> TargetSwitcher_TargetDefinitionErrorMsg=Failed to create target definition
>-TargetSwitcher_TargetRepositoryProblemErrorMsg=RAP target installation failed to download the target. There are problems with the RAP target repository.
>+TargetSwitcher_TargetRepositoryProblemErrorMsg=RAP target installation failed to download \
>+  the target. There are problems with the RAP target repository.

Actions: View | Diff

Attachments on bug 345403: 195331