mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-08 18:26:01 +02:00
Code Issues Wiki Activity

Added binaryParserBock in the tab items.

Browse source 
the performOK should be done in a runnable
This commit is contained in:
Alain Magloire 2002-11-27 04:50:03 +00:00
parent 0e5d20731a
commit b1ffc262c2
1 changed files with 50 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CProjectPropertyPage.java
View file

@ -5,24 +5,32 @@ package org.eclipse.cdt.internal.ui.preferences;
* All Rights Reserved. * All Rights Reserved.
*/ */
import java.lang.reflect.InvocationTargetException;
import org.eclipse.cdt.internal.ui.ICHelpContextIds; import org.eclipse.cdt.internal.ui.ICHelpContextIds;
import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener;
import org.eclipse.cdt.internal.ui.dialogs.StatusTool; import org.eclipse.cdt.internal.ui.dialogs.StatusTool;
import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.ui.wizards.BinaryParserBlock;
import org.eclipse.cdt.ui.wizards.IndexerBlock; import org.eclipse.cdt.ui.wizards.IndexerBlock;
import org.eclipse.cdt.ui.wizards.SettingsBlock; import org.eclipse.cdt.ui.wizards.SettingsBlock;
import org.eclipse.cdt.utils.ui.controls.TabFolderLayout; import org.eclipse.cdt.utils.ui.controls.TabFolderLayout;
import org.eclipse.cdt.utils.ui.swt.IValidation; import org.eclipse.cdt.utils.ui.swt.IValidation;
import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.IStatus;
import org.eclipse.jface.dialogs.ProgressMonitorDialog;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.swt.SWT; import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.TabFolder; import org.eclipse.swt.widgets.TabFolder;
import org.eclipse.swt.widgets.TabItem; import org.eclipse.swt.widgets.TabItem;
import org.eclipse.ui.actions.WorkspaceModifyDelegatingOperation;
import org.eclipse.ui.dialogs.PropertyPage; import org.eclipse.ui.dialogs.PropertyPage;
import org.eclipse.ui.help.WorkbenchHelp; import org.eclipse.ui.help.WorkbenchHelp;
@ -34,6 +42,7 @@ public class CProjectPropertyPage extends PropertyPage implements IStatusChangeL
private TabFolder folder; private TabFolder folder;
SettingsBlock settingsBlock; SettingsBlock settingsBlock;
IndexerBlock indexerBlock; IndexerBlock indexerBlock;
BinaryParserBlock binaryParserBlock;
protected Control createContents(Composite parent) { protected Control createContents(Composite parent) {
Composite composite= new Composite(parent, SWT.NONE); Composite composite= new Composite(parent, SWT.NONE);
@ -71,6 +80,15 @@ public class CProjectPropertyPage extends PropertyPage implements IStatusChangeL
item3.setData(indexerBlock); item3.setData(indexerBlock);
item3.setControl(indexerBlock.getControl(folder)); item3.setControl(indexerBlock.getControl(folder));
binaryParserBlock = new BinaryParserBlock(this, getProject());
TabItem item4 = new TabItem(folder, SWT.NONE);
item4.setText(binaryParserBlock.getLabel());
Image img4 = binaryParserBlock.getImage();
if (img4 != null)
item4.setImage(img4);
item4.setData(binaryParserBlock);
item4.setControl(binaryParserBlock.getControl(folder));
WorkbenchHelp.setHelp(parent, ICHelpContextIds.PROJECT_PROPERTY_PAGE); WorkbenchHelp.setHelp(parent, ICHelpContextIds.PROJECT_PROPERTY_PAGE);
} }
@ -91,6 +109,9 @@ public class CProjectPropertyPage extends PropertyPage implements IStatusChangeL
if (ok && indexerBlock != null) { if (ok && indexerBlock != null) {
ok = indexerBlock.isValid(); ok = indexerBlock.isValid();
} }
if (ok && binaryParserBlock != null) {
ok = binaryParserBlock.isValid();
}
setValid(ok); setValid(ok);
} }
@ -98,15 +119,38 @@ public class CProjectPropertyPage extends PropertyPage implements IStatusChangeL
* @see PreferencePage#performOk * @see PreferencePage#performOk
*/ */
public boolean performOk() { public boolean performOk() {
if (settingsBlock != null) Shell shell= getControl().getShell();
settingsBlock.doRun(getProject(), null); IRunnableWithProgress runnable= new IRunnableWithProgress() {
public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
monitor.beginTask("Property changes", 20);
if (settingsBlock != null) {
settingsBlock.doRun(getProject(), monitor);
}
monitor.worked(2);
if (indexerBlock != null) { if (indexerBlock != null) {
indexerBlock.doRun(getProject(), null); indexerBlock.doRun(getProject(), monitor);
}
monitor.worked(10);
if (binaryParserBlock != null) {
binaryParserBlock.doRun(getProject(), monitor);
}
monitor.worked(19);
monitor.done();
}
};
IRunnableWithProgress op= new WorkspaceModifyDelegatingOperation(runnable);
try {
new ProgressMonitorDialog(shell).run(false, true, op);
} catch (InvocationTargetException e) {
return false;
} catch (InterruptedException e) {
// cancelled
return false;
} }
return true; return true;
} }
private IProject getProject() { IProject getProject() {
Object element= getElement(); Object element= getElement();
if (element instanceof IProject) { if (element instanceof IProject) {
return (IProject)element; return (IProject)element;
@ -122,6 +166,7 @@ public class CProjectPropertyPage extends PropertyPage implements IStatusChangeL
if (visible && folder != null) { if (visible && folder != null) {
settingsBlock.setVisible(visible); settingsBlock.setVisible(visible);
indexerBlock.setVisible(visible); indexerBlock.setVisible(visible);
binaryParserBlock.setVisible(visible);
folder.setFocus(); folder.setFocus();
} }
} }