Bug 515329 - Update APT help UII20170510-0800I20170509-2000I20170509-1300I20170509-1100I20170509-0945I20170509-0800I20170508-2000I20170508-0800

- Hook help into AdvancedFactoryPathOptionsDialog via '?' button
  (by extending StatusDialog like the processor options dialog)
- Remove options note that is only true for Java 5 processors
  (help content for APT contains details about automatic options)

Change-Id: Iee7b6bd9fd06c8b9e1ab53b3d6402d2e94c40bc6
Signed-off-by: Fabian Steeg <steeg@hbz-nrw.de>

4 files changed, 7 insertions, 15 deletions

diff --git a/org.eclipse.jdt.apt.ui/src/org/eclipse/jdt/apt/ui/internal/preferences/AdvancedFactoryPathOptionsDialog.java b/org.eclipse.jdt.apt.ui/src/org/eclipse/jdt/apt/ui/internal/preferences/AdvancedFactoryPathOptionsDialog.java
index f99b848286..757e25f7c2 100644
--- a/org.eclipse.jdt.apt.ui/src/org/eclipse/jdt/apt/ui/internal/preferences/AdvancedFactoryPathOptionsDialog.java
+++ b/org.eclipse.jdt.apt.ui/src/org/eclipse/jdt/apt/ui/internal/preferences/AdvancedFactoryPathOptionsDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 BEA Systems, Inc.
+ * Copyright (c) 2005, 2007 BEA Systems, Inc 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
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *   wharley@bea.com - initial API and implementation
+ *   Fabian Steeg <steeg@hbz-nrw.de> - Update APT options documentation - https://bugs.eclipse.org/515329
  *******************************************************************************/
 
 package org.eclipse.jdt.apt.ui.internal.preferences;
@@ -21,7 +22,7 @@ import org.eclipse.jdt.apt.ui.internal.util.IAptHelpContextIds;
 import org.eclipse.jdt.internal.ui.wizards.dialogfields.DialogField;
 import org.eclipse.jdt.internal.ui.wizards.dialogfields.IDialogFieldListener;
 import org.eclipse.jdt.internal.ui.wizards.dialogfields.SelectionButtonDialogField;
-import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.StatusDialog;
 import org.eclipse.jface.viewers.ListViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
@@ -38,7 +39,7 @@ import org.eclipse.ui.PlatformUI;
  * be configured, and which may require deeper-than-usual
  * understanding of the annotation processing architecture.
  */
-public class AdvancedFactoryPathOptionsDialog extends Dialog {
+public class AdvancedFactoryPathOptionsDialog extends StatusDialog {
 	
 	private final static int LIST_WIDTH= 70; // width (in chars) of factory list
 	private final static int LIST_HEIGHT= 10; // number of lines in factory list
diff --git a/org.eclipse.jdt.apt.ui/src/org/eclipse/jdt/apt/ui/internal/preferences/AptConfigurationBlock.java b/org.eclipse.jdt.apt.ui/src/org/eclipse/jdt/apt/ui/internal/preferences/AptConfigurationBlock.java
index cf210f3dce..4824e3dbb4 100644
--- a/org.eclipse.jdt.apt.ui/src/org/eclipse/jdt/apt/ui/internal/preferences/AptConfigurationBlock.java
+++ b/org.eclipse.jdt.apt.ui/src/org/eclipse/jdt/apt/ui/internal/preferences/AptConfigurationBlock.java
@@ -8,6 +8,7 @@
  * Contributors:
  *     BEA Systems Inc. - initial API and implementation
  *     IBM Corporation  - fix deprecation warnings
+ *     Fabian Steeg <steeg@hbz-nrw.de> - Update APT options documentation - https://bugs.eclipse.org/515329
  *******************************************************************************/
 package org.eclipse.jdt.apt.ui.internal.preferences;
 
@@ -30,7 +31,6 @@ import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
@@ -325,13 +325,6 @@ public class AptConfigurationBlock extends BaseConfigurationBlock {
 		reconcileGD.horizontalIndent = indent;
 		fReconcileEnabledField.getSelectionButton(parent).setLayoutData(reconcileGD);
 		
-		Label description= new Label(fBlockControl, SWT.WRAP);
-		description.setText(Messages.AptConfigurationBlock_classpathAddedAutomaticallyNote);
-		GridData gdLabel= new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		gdLabel.horizontalSpan= 2;
-		gdLabel.widthHint= fPixelConverter.convertWidthInCharsToPixels(60);
-		description.setLayoutData(gdLabel);
-		
 		Dialog.applyDialogFont(fBlockControl);
 		
 		validateSettings(null, null, null);
diff --git a/org.eclipse.jdt.apt.ui/src/org/eclipse/jdt/apt/ui/internal/preferences/Messages.java b/org.eclipse.jdt.apt.ui/src/org/eclipse/jdt/apt/ui/internal/preferences/Messages.java
index 73208ff0bf..c4bf99358e 100644
--- a/org.eclipse.jdt.apt.ui/src/org/eclipse/jdt/apt/ui/internal/preferences/Messages.java
+++ b/org.eclipse.jdt.apt.ui/src/org/eclipse/jdt/apt/ui/internal/preferences/Messages.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 BEA Systems, Inc. 
+ * Copyright (c) 2005, 2007 BEA Systems, Inc 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
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *    jgarms@bea.com - initial API and implementation
+ *    Fabian Steeg <steeg@hbz-nrw.de> - Update APT options documentation - https://bugs.eclipse.org/515329
  *    
  *******************************************************************************/
 package org.eclipse.jdt.apt.ui.internal.preferences;
@@ -64,8 +65,6 @@ public class Messages extends NLS {
 
 	public static String BaseConfigurationBlock_rebuildRequired;
 
-	public static String AptConfigurationBlock_classpathAddedAutomaticallyNote;
-
 	public static String AptConfigurationBlock_warningIgnoredOptions;
 
 	public static String FactoryPathConfigurationBlock_unableToSaveFactorypath_title;
diff --git a/org.eclipse.jdt.apt.ui/src/org/eclipse/jdt/apt/ui/internal/preferences/messages.properties b/org.eclipse.jdt.apt.ui/src/org/eclipse/jdt/apt/ui/internal/preferences/messages.properties
index 3379f7d517..d07f4d9523 100644
--- a/org.eclipse.jdt.apt.ui/src/org/eclipse/jdt/apt/ui/internal/preferences/messages.properties
+++ b/org.eclipse.jdt.apt.ui/src/org/eclipse/jdt/apt/ui/internal/preferences/messages.properties
@@ -15,7 +15,6 @@ AptConfigurationBlock_generatedSrcDir=&Generated source directory:
 AptConfigurationBlock_warningIgnoredOptions=An automatically set option will override this option
 AptConfigurationBlock_warningContentsMayBeDeleted=Contents of generated source directory may be deleted
 AptConfigurationBlock_enableReconcileProcessing=Enable processing in edito&r
-AptConfigurationBlock_classpathAddedAutomaticallyNote=Note: options such as \"-classpath\" and \"-sourcepath\" are automatically passed to all processors, with values corresponding to the project's Java settings.
 AptConfigurationBlock_genSrcDirMustBeValidRelativePath=Generated source directory must be a valid relative path
 AptConfigurationBlock_options=Processor options (-Akey=value):
 AptPreferencePage_preferences=Specify the default annotation processor settings for new projects: