diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog index cd65383b7b5..5c34d15e315 100644 --- a/core/org.eclipse.cdt.ui/ChangeLog +++ b/core/org.eclipse.cdt.ui/ChangeLog @@ -1,3 +1,19 @@ +2002-10-31 Judy N. Green + Removed the ReferenceBlock from the Project Properties display. Eclipse + adds a Project Properties entry to the Project Properties. + This was resulting in confusion since the + C/C++ Project --> Project References (filtered on nature == cnature) + + and the + Project References (unfiltered, showing all projects) + + Both listed some files in common, but they were not linked in any way + so the user could get into a very awkward state, when selecting or deselecting + as one view woud over ride the other. + + src/org/eclipse/cdt/internal/ui/preferences/CProjectPropertyPage.java + + 2002-10-29 David Inglis Refactor ui.internal.CPlugin to ui.CUIPlugin with method to get the new diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CProjectPropertyPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CProjectPropertyPage.java index a8d502e220d..06f9534e199 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CProjectPropertyPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CProjectPropertyPage.java @@ -9,7 +9,6 @@ import org.eclipse.cdt.internal.ui.ICHelpContextIds; import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; import org.eclipse.cdt.internal.ui.dialogs.StatusTool; import org.eclipse.cdt.ui.CUIPlugin; -import org.eclipse.cdt.ui.wizards.ReferenceBlock; import org.eclipse.cdt.ui.wizards.SettingsBlock; import org.eclipse.cdt.utils.ui.controls.TabFolderLayout; import org.eclipse.cdt.utils.ui.swt.IValidation; @@ -32,7 +31,6 @@ public class CProjectPropertyPage extends PropertyPage implements IStatusChangeL private static final String MSG_CLOSEDPROJECT= "CProjectPropertyPage.closedproject"; private TabFolder folder; - ReferenceBlock referenceBlock; SettingsBlock settingsBlock; protected Control createContents(Composite parent) { @@ -53,15 +51,6 @@ public class CProjectPropertyPage extends PropertyPage implements IStatusChangeL folder = new TabFolder(parent, SWT.NONE); folder.setLayout(new TabFolderLayout()); - referenceBlock = new ReferenceBlock(this, getProject()); - TabItem item = new TabItem(folder, SWT.NONE); - item.setText(referenceBlock.getLabel()); - Image img = referenceBlock.getImage(); - if (img != null) - item.setImage(img); - item.setData(referenceBlock); - item.setControl(referenceBlock.getControl(folder)); - settingsBlock = new SettingsBlock(this, getProject()); TabItem item2 = new TabItem(folder, SWT.NONE); item2.setText(settingsBlock.getLabel()); @@ -84,9 +73,7 @@ public class CProjectPropertyPage extends PropertyPage implements IStatusChangeL public void setComplete(boolean complete) { boolean ok = true; - if (referenceBlock != null) { - ok = referenceBlock.isValid(); - } + if (ok && settingsBlock != null) { ok = settingsBlock.isValid(); } @@ -99,8 +86,7 @@ public class CProjectPropertyPage extends PropertyPage implements IStatusChangeL public boolean performOk() { if (settingsBlock != null) settingsBlock.doRun(getProject(), null); - if (referenceBlock != null) - referenceBlock.doRun(getProject(), null); + return true; } @@ -119,7 +105,6 @@ public class CProjectPropertyPage extends PropertyPage implements IStatusChangeL super.setVisible(visible); if (visible && folder != null) { settingsBlock.setVisible(visible); - referenceBlock.setVisible(visible); folder.setFocus(); } }