Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Spungin2014-06-24 09:25:16 -0400
committerSteven Spungin2014-06-24 09:29:34 -0400
commitdc053372d3ccb9d48d7e233a886a356f4c48c395 (patch)
tree574f5c60eb8362c06021c50ecfe3c58e0d1050c9
parentaa846312ce421aa9f9754ac74312286776c7d176 (diff)
downloadorg.eclipse.e4.tools-dc053372d3ccb9d48d7e233a886a356f4c48c395.tar.gz
org.eclipse.e4.tools-dc053372d3ccb9d48d7e233a886a356f4c48c395.tar.xz
org.eclipse.e4.tools-dc053372d3ccb9d48d7e233a886a356f4c48c395.zip
visible by default Change-Id: I944361424f290114ec3e64c612c3161f9b570334
-rw-r--r--bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java24
-rw-r--r--bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java9
-rw-r--r--bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java5
3 files changed, 6 insertions, 32 deletions
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java
index f1a22076..2b501574 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/ModelEditorPreferencePage.java
@@ -1,7 +1,7 @@
/*******************************************************************************
*
* Contributors:
- * Steven Spungin <steven@spungin.tv> - Bug 431735
+ * Steven Spungin <steven@spungin.tv> - Bug 431735, Bug 437890
******************************************************************************/
package org.eclipse.e4.tools.emf.editor3x;
@@ -27,7 +27,6 @@ public class ModelEditorPreferencePage extends PreferencePage implements IWorkbe
private ColorFieldEditor fColorValueNotRendered;
private ColorFieldEditor fColorValueNotVisible;
private ColorFieldEditor fColorValueNotVisibleAndRendered;
- private BooleanFieldEditor fShowListTab;
private BooleanFieldEditor fShowSearch;
public ModelEditorPreferencePage() {
@@ -101,7 +100,7 @@ public class ModelEditorPreferencePage extends PreferencePage implements IWorkbe
fShowXMIId.setPreferenceStore(getPreferenceStore());
fShowXMIId.load();
}
-
+
{
Composite container = new Composite(group, SWT.NONE);
container.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false, 2, 1));
@@ -110,23 +109,6 @@ public class ModelEditorPreferencePage extends PreferencePage implements IWorkbe
fShowSearch.setPreferenceStore(getPreferenceStore());
fShowSearch.load();
}
-
- }
-
- {
- Group group = new Group(result, SWT.NONE);
- group.setText("Tabs");
- group.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false, 2, 1));
- group.setLayout(new GridLayout(2, false));
-
- {
- Composite container = new Composite(group, SWT.NONE);
- container.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false, 2, 1));
- fShowListTab = new BooleanFieldEditor("tab-list-show", "Show List Tab", container);
- fShowListTab.setPage(this);
- fShowListTab.setPreferenceStore(getPreferenceStore());
- fShowListTab.load();
- }
}
return result;
@@ -139,7 +121,6 @@ public class ModelEditorPreferencePage extends PreferencePage implements IWorkbe
fColorValueNotRendered.store();
fColorValueNotVisible.store();
fColorValueNotVisibleAndRendered.store();
- fShowListTab.store();
fShowSearch.store();
return super.performOk();
}
@@ -151,7 +132,6 @@ public class ModelEditorPreferencePage extends PreferencePage implements IWorkbe
fColorValueNotRendered.loadDefault();
fColorValueNotVisible.loadDefault();
fColorValueNotVisibleAndRendered.loadDefault();
- fShowListTab.loadDefault();
fShowSearch.loadDefault();
super.performDefaults();
}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java
index 2587345e..7a9d2fcc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/PreferenceInitializer.java
@@ -1,7 +1,7 @@
/*******************************************************************************
*
* Contributors:
- * Steven Spungin <steven@spungin.tv> - Bug 431735
+ * Steven Spungin <steven@spungin.tv> - Bug 431735, Bug 437890
******************************************************************************/
package org.eclipse.e4.tools.emf.ui.internal;
@@ -36,12 +36,7 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer {
if (pref.get("autoCreateElementId", null) == null) { //$NON-NLS-1$
pref.putBoolean("autoCreateElementId", true); //$NON-NLS-1$
}
-
- // TODO: if accepted, this should default to true
- if (pref.get("tab-list-show", null) == null) { //$NON-NLS-1$
- pref.putBoolean("tab-list-show", false); //$NON-NLS-1$
- }
-
+
// TODO: After XMI tab is not forced disabled, this should default to
// true
if (pref.get("tab-form-search-show", null) == null) { //$NON-NLS-1$
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 90693188..65b418d4 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -429,7 +429,7 @@ public class ModelEditor implements IGotoObject {
tabItemTree.setControl(createFormTab(editorTabFolder));
tabItemTree.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Obj16_application_form));
- tab_list_show(preferences.getBoolean("tab-list-show", false)); //$NON-NLS-1$
+ tab_list_show(true);
tabItemXmi = new CTabItem(editorTabFolder, SWT.NONE);
tabItemXmi.setText(messages.ModelEditor_XMI);
@@ -1281,8 +1281,7 @@ public class ModelEditor implements IGotoObject {
registerEditor(FragmentPackageImpl.Literals.STRING_MODEL_FRAGMENT, ContextInjectionFactory.make(StringModelFragment.class, context));
}
- @Inject
- public void tab_list_show(@Preference("tab-list-show") Boolean show) {
+ public void tab_list_show(Boolean show) {
if (editorTabFolder == null) {
return;
}

Back to the top