From 7b016f3cf43c513da9ccc54df3f104e55437c43b Mon Sep 17 00:00:00 2001 From: Oleg Krasilnikov Date: Fri, 30 Mar 2007 10:36:01 +0000 Subject: [PATCH] methods naming consistency. --- .../preferences/PreferredToolchainsTab.java | 1 + .../ui/preferences/WizardDefaultsTab.java | 1 + .../ui/properties/ArtifactTab.java | 2 +- .../ui/properties/BuildStepsTab.java | 1 + .../ui/properties/BuilderSettingsTab.java | 16 +- .../ui/properties/CPropertyVarsTab.java | 2 +- .../ui/properties/DiscoveryTab.java | 1 + .../ui/properties/ToolChainEditTab.java | 1 + .../cdt/ui/newui/AbstractCPropertyTab.java | 1 + .../cdt/ui/newui/AbstractExportTab.java | 8 +- .../cdt/ui/newui/AbstractLangsListTab.java | 2 +- .../eclipse/cdt/ui/newui/CLocationTab.java | 2 +- .../eclipse/cdt/ui/newui/LanguagesTab.java | 144 ------------------ .../cdt/ui/newui/PropertyPageDefsTab.java | 1 + .../src/org/eclipse/cdt/ui/newui/RefsTab.java | 1 + .../cdt/ui/newui/StructureTreeTab.java | 2 + 16 files changed, 26 insertions(+), 160 deletions(-) delete mode 100644 core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/LanguagesTab.java diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PreferredToolchainsTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PreferredToolchainsTab.java index cad8c942a05..1ee650739f1 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PreferredToolchainsTab.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PreferredToolchainsTab.java @@ -139,4 +139,5 @@ public class PreferredToolchainsTab extends AbstractCBuildPropertyTab { h_selected.handleSelection(); } protected void updateData(ICResourceDescription cfg) {} + protected void updateButtons() {} // Do nothing. No buttons to update. } diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/WizardDefaultsTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/WizardDefaultsTab.java index 1b3f0834000..530ca32f40a 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/WizardDefaultsTab.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/WizardDefaultsTab.java @@ -53,4 +53,5 @@ public class WizardDefaultsTab extends AbstractCPropertyTab { protected void performApply(ICResourceDescription src, ICResourceDescription dst) { performOK(); } protected void updateData(ICResourceDescription cfg) {} // Do nothing. Data is read once after creation + protected void updateButtons() {} // Do nothing. No buttons to update. } diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ArtifactTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ArtifactTab.java index 80f75827248..49941507df7 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ArtifactTab.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ArtifactTab.java @@ -156,5 +156,5 @@ public class ArtifactTab extends AbstractCBuildPropertyTab { else return false; } - + protected void updateButtons() {} // Do nothing. No buttons to update. } diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildStepsTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildStepsTab.java index b39a7f341f6..92cf41918ff 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildStepsTab.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildStepsTab.java @@ -371,4 +371,5 @@ public class BuildStepsTab extends AbstractCBuildPropertyTab { } update(); } + protected void updateButtons() {} // Do nothing. No buttons to update. } diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuilderSettingsTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuilderSettingsTab.java index 3c68ef8a918..ce43166ee12 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuilderSettingsTab.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuilderSettingsTab.java @@ -88,7 +88,7 @@ public class BuilderSettingsTab extends AbstractCBuildPropertyTab { c_builderType.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent event) { cfg.enableInternalBuilder(c_builderType.getSelectionIndex() == 1); - setState(); + updateButtons(); }}); b_useDefault = setupCheck(g1, Messages.getString("BuilderSettingsTab.4"), 3, GridData.BEGINNING); //$NON-NLS-1$ @@ -135,7 +135,7 @@ public class BuilderSettingsTab extends AbstractCBuildPropertyTab { b_parallelOpt.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent event) { cfg.setParallelDef(b_parallelOpt.getSelection()); - setState(); + updateButtons(); }}); b_parallelNum= new Button(c2, SWT.RADIO); @@ -145,7 +145,7 @@ public class BuilderSettingsTab extends AbstractCBuildPropertyTab { b_parallelNum.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent event) { cfg.setParallelDef(!b_parallelNum.getSelection()); - setState(); + updateButtons(); }}); parallelProcesses = new Spinner(c2, SWT.BORDER); @@ -154,7 +154,7 @@ public class BuilderSettingsTab extends AbstractCBuildPropertyTab { parallelProcesses.addSelectionListener(new SelectionAdapter () { public void widgetSelected(SelectionEvent e) { cfg.setParallelNumber(parallelProcesses.getSelection()); - setState(); + updateButtons(); } }); @@ -211,14 +211,14 @@ public class BuilderSettingsTab extends AbstractCBuildPropertyTab { try { bld.setManagedBuildOn(enable); page.informPages(MANAGEDBUILDSTATE, null); - setState(); + updateButtons(); } catch (CoreException ex) {} } /** * sets widgets states */ - void setState() { + protected void updateButtons() { bld = cfg.getEditableBuilder(); b_genMakefileAuto.setEnabled(cfg.supportsBuild(true)); @@ -353,7 +353,7 @@ public class BuilderSettingsTab extends AbstractCBuildPropertyTab { public void checkPressed(SelectionEvent e) { checkPressed((Button)e.widget); - setState(); + updateButtons(); } void checkPressed(Button b) { @@ -412,7 +412,7 @@ public class BuilderSettingsTab extends AbstractCBuildPropertyTab { IConfiguration icfg = getCfg(cfgd.getConfiguration()); if (!(icfg instanceof Configuration)) return; cfg = (Configuration)icfg; - setState(); + updateButtons(); } public void performApply(ICResourceDescription src, ICResourceDescription dst) { diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/CPropertyVarsTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/CPropertyVarsTab.java index ef2d7ae1aa3..4582ab177ec 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/CPropertyVarsTab.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/CPropertyVarsTab.java @@ -220,7 +220,7 @@ public class CPropertyVarsTab extends AbstractCPropertyTab { updateButtons(); } - private void updateButtons() { + protected void updateButtons() { Object[] obs = ((IStructuredSelection)tv.getSelection()).toArray(); boolean canEdit = false; boolean canDel = false; diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java index 38ce9f35f53..56b9b0d9c12 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java @@ -522,4 +522,5 @@ public class DiscoveryTab extends AbstractCBuildPropertyTab implements IBuildInf } updateData(); } + protected void updateButtons() {} // Do nothing. No buttons to update. } diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolChainEditTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolChainEditTab.java index 5932aa61cb4..d37357566d2 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolChainEditTab.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolChainEditTab.java @@ -246,4 +246,5 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab { protected void performDefaults() { updateData(); } + protected void updateButtons() {} // Do nothing. No buttons to update. } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractCPropertyTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractCPropertyTab.java index ed191365bd2..68fc193d72d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractCPropertyTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractCPropertyTab.java @@ -214,6 +214,7 @@ public abstract class AbstractCPropertyTab implements ICPropertyTab { protected abstract void performApply(ICResourceDescription src, ICResourceDescription dst); protected abstract void performDefaults(); protected abstract void updateData(ICResourceDescription cfg); + protected abstract void updateButtons(); protected void performCancel() {} protected void performOK() {} diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractExportTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractExportTab.java index 2cebaae8bd7..fa13f209e35 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractExportTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractExportTab.java @@ -112,7 +112,7 @@ public abstract class AbstractExportTab extends AbstractCPropertyTab { table.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { - setButtons(); + updateButtons(); } public void widgetDefaultSelected(SelectionEvent e) { if (buttonIsEnabled(1) && table.getSelectionIndex() != -1) @@ -141,7 +141,7 @@ public abstract class AbstractExportTab extends AbstractCPropertyTab { * Updates state of add/edit/delete buttons * Called when table selection changes. */ - protected void setButtons() { + protected void updateButtons() { int i = table.getSelectionIndex(); boolean x = i != -1; boolean y = x; @@ -175,7 +175,7 @@ public abstract class AbstractExportTab extends AbstractCPropertyTab { ICExternalSetting[] vals = cfg.getExternalSettings(); if (vals == null || vals.length == 0) { tv.setInput(null); - setButtons(); + updateButtons(); return; } for (int i=0; i x) table.select(x); else if (table.getItemCount() > 0) table.select(0); - setButtons(); + updateButtons(); } /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractLangsListTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractLangsListTab.java index a18b965b4f2..084753287d6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractLangsListTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractLangsListTab.java @@ -165,7 +165,7 @@ public abstract class AbstractLangsListTab extends AbstractCPropertyTab { * Updates state for all buttons * Called when table selection changes. */ - public void updateButtons() { + protected void updateButtons() { int index = table.getSelectionIndex(); boolean canAdd = langTree.getItemCount() > 0; boolean canExport = index != -1; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CLocationTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CLocationTab.java index d43fba7cd89..43d7115b972 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CLocationTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CLocationTab.java @@ -154,7 +154,7 @@ public abstract class CLocationTab extends AbstractCPropertyTab { * Edit: enabled if 1 element selected (entry or filter) * Delete: enabled if selected element is entry */ - private void updateButtons() { + protected void updateButtons() { TreeItem[] sel = tree.getTree().getSelection(); buttonSetEnabled(2, sel.length == 1); buttonSetEnabled(3, sel.length > 0 && sel[0].getData() instanceof _Entry); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/LanguagesTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/LanguagesTab.java deleted file mode 100644 index a220fef6601..00000000000 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/LanguagesTab.java +++ /dev/null @@ -1,144 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Intel Corporation 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Intel Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.ui.newui; - -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.content.IContentTypeManager; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Table; -import org.eclipse.swt.widgets.TableColumn; - -import org.eclipse.cdt.core.model.ILanguageDescriptor; -import org.eclipse.cdt.core.model.LanguageManager; -import org.eclipse.cdt.core.settings.model.ICResourceDescription; - -/** - * - * Functionality temporary commented - * because of changes in Languages manager. - * - * - */ - -public class LanguagesTab extends AbstractCPropertyTab { - - Table table; - LanguageManager lm = LanguageManager.getInstance(); - IContentTypeManager ctm = Platform.getContentTypeManager(); - IResource cr; - - public void createControls(Composite parent) { - super.createControls(parent); - cr = (IResource)page.getElement(); - - usercomp.setLayout(new GridLayout(2, false)); - - table = new Table(usercomp, SWT.V_SCROLL | SWT.H_SCROLL | SWT.FULL_SELECTION | SWT.BORDER); - table.setHeaderVisible(true); - table.setLinesVisible(true); - String[] headers = new String[] {UIMessages.getString("LanguagesTab.0"), UIMessages.getString("LanguagesTab.1"), }; //$NON-NLS-1$ //$NON-NLS-2$ - - for (int i = 0; i < headers.length; i++) { - TableColumn tc = new TableColumn(table, SWT.LEFT); - tc.setText(headers[i]); - tc.setWidth(200); - } - GridData gd = new GridData(GridData.FILL_BOTH); - gd.grabExcessHorizontalSpace = true; - table.setLayoutData(gd); - - } - - class ComboDataHolder { - String id; - ILanguageDescriptor[] des; - - ComboDataHolder(String _id, ILanguageDescriptor[] _des) { - id = _id; - des = _des; - } - } - - public void updateData(ICResourceDescription cfgd2) { - /* - table.removeAll(); - String[] ids = lm.getRegisteredContentTypeIds(); - for (int i=0; i< ids.length; i++) { - IContentType ct = ctm.getContentType(ids[i]); - ILanguageDescriptor[] des = null; - boolean needForFile = true; - if (cr instanceof IFile) { - needForFile = ct.isAssociatedWith(cr.getName()); - } - if (needForFile) { - des = lm.getDescriptorsForContentTypeId(ids[i]); - } - if (des != null && des.length > 0) { - TableItem t = new TableItem(table, SWT.NONE); - t.setText(0, ct.getName()); - t.setData(ct); - - TableEditor editor = new TableEditor(table); - CCombo combo = new CCombo(table, SWT.NONE); - combo.setData(new ComboDataHolder(ct.getId(), des)); - int pos = 0; - - ILanguageDescriptor curr = lm.getLanguageForContentTypeId(cr.getProject(), cr.getFullPath().removeFirstSegments(1), ids[i]); - for (int j=0; j