Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkmoore2012-03-20 17:55:01 +0000
committerkmoore2012-03-20 17:55:01 +0000
commitde4ebdb4146595a2cffb51a2857c2e639fbf641e (patch)
tree853db97ad9c7f2cc555b9a65a35f375de62563cb /common/plugins
parent505a127bfc943123df770b200afe7ddec4e1dcc3 (diff)
downloadwebtools.dali-de4ebdb4146595a2cffb51a2857c2e639fbf641e.tar.gz
webtools.dali-de4ebdb4146595a2cffb51a2857c2e639fbf641e.tar.xz
webtools.dali-de4ebdb4146595a2cffb51a2857c2e639fbf641e.zip
cleaning up enablement code
Diffstat (limited to 'common/plugins')
-rw-r--r--common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/ChooserPane.java14
-rw-r--r--common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/EnumDialogComboViewer.java10
-rw-r--r--common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/EnumFormComboViewer.java10
-rw-r--r--common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/Pane.java2
4 files changed, 1 insertions, 35 deletions
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/ChooserPane.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/ChooserPane.java
index 2a46bf1f4c..d9a2fa753e 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/ChooserPane.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/ChooserPane.java
@@ -165,18 +165,4 @@ public abstract class ChooserPane<T extends Model> extends Pane<T>
protected String getHelpId() {
return null;
}
-
- @Override
- public void enableWidgets(boolean enabled) {
-
- super.enableWidgets(enabled);
-
- if (!this.mainControl.isDisposed()) {
- this.mainControl.setEnabled(getCombinedEnablement());
- }
-
- if (!this.rightControl.isDisposed()) {
- this.rightControl.setEnabled(getCombinedEnablement());
- }
- }
}
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/EnumDialogComboViewer.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/EnumDialogComboViewer.java
index 85d6b19518..b9dc901834 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/EnumDialogComboViewer.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/EnumDialogComboViewer.java
@@ -51,16 +51,6 @@ public abstract class EnumDialogComboViewer<T extends Model, V>
super(parentPane, subjectHolder, parent);
}
- @Override
- public void enableWidgets(boolean enabled) {
- super.enableWidgets(enabled);
-
- Combo combo = getCombo();
- if ( ! combo.isDisposed()) {
- combo.setEnabled(enabled);
- }
- }
-
protected final Combo getCombo() {
return getComboViewer().getCombo();
}
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/EnumFormComboViewer.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/EnumFormComboViewer.java
index b6ee89f7ec..25a1c0e350 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/EnumFormComboViewer.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/EnumFormComboViewer.java
@@ -51,16 +51,6 @@ public abstract class EnumFormComboViewer<T extends Model, V>
super(parentPane, subjectHolder, parent);
}
- @Override
- public void enableWidgets(boolean enabled) {
- super.enableWidgets(enabled);
-
- Combo combo = getCombo();
- if ( ! combo.isDisposed()) {
- combo.setEnabled(enabled);
- }
- }
-
protected final Combo getCombo() {
return this.getComboViewer().getCombo();
}
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/Pane.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/Pane.java
index 6a4019e029..643371e6d8 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/Pane.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/Pane.java
@@ -3299,7 +3299,7 @@ public abstract class Pane<T extends Model>
return (this.combinedEnabledModel != null) ? this.combinedEnabledModel : this.baseEnabledModel;
}
- protected boolean getCombinedEnablement() {
+ private boolean getCombinedEnablement() {
Boolean enabled = getCombinedEnabledModel().getValue();
return (enabled == null) ? true : enabled.booleanValue();
}

Back to the top