Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 395283 | Differences between
and this patch

Collapse All | Expand All

(-)a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF (-1 / +2 lines)
Lines 2-8 Manifest-Version: 1.0 Link Here
2
Bundle-ManifestVersion: 2
2
Bundle-ManifestVersion: 2
3
Bundle-Name: %pluginName
3
Bundle-Name: %pluginName
4
Bundle-SymbolicName: org.eclipse.e4.tools.emf.ui;singleton:=true
4
Bundle-SymbolicName: org.eclipse.e4.tools.emf.ui;singleton:=true
5
Bundle-Version: 0.12.0.qualifier
5
Bundle-Version: 0.12.1.qualifier
6
Bundle-ClassPath: .
6
Bundle-ClassPath: .
7
Bundle-Vendor: %providerName
7
Bundle-Vendor: %providerName
8
Bundle-Localization: plugin
8
Bundle-Localization: plugin
Lines 45-47 Export-Package: org.eclipse.e4.tools.emf.ui.common, Link Here
45
 org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;x-internal:=true,
45
 org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;x-internal:=true,
46
 org.eclipse.e4.tools.emf.ui.internal.wbm;x-friends:="org.eclipse.e4.tools.emf.editor"
46
 org.eclipse.e4.tools.emf.ui.internal.wbm;x-friends:="org.eclipse.e4.tools.emf.editor"
47
Service-Component: OSGI-INF/contributioncollector.xml, OSGI-INF/resourceprovider.xml
47
Service-Component: OSGI-INF/contributioncollector.xml, OSGI-INF/resourceprovider.xml
48
Bundle-Activator: org.eclipse.e4.tools.emf.ui.internal.ToolsEmfUiPlugin
(-)a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/ToolsEmfUiPlugin.java (+58 lines)
Added Link Here
1
/*******************************************************************************
2
 * Copyright (c) 2012 MEDEVIT and FHV and others.
3
 * All rights reserved. This program and the accompanying materials
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
6
 * http://www.eclipse.org/legal/epl-v10.html
7
 *
8
 * Contributors:
9
 *     Marco Descher <marco@descher.at> - initial API and implementation
10
 ******************************************************************************/
11
package org.eclipse.e4.tools.emf.ui.internal;
12
13
import org.eclipse.jface.dialogs.DialogSettings;
14
import org.eclipse.jface.dialogs.IDialogSettings;
15
import org.osgi.framework.BundleActivator;
16
import org.osgi.framework.BundleContext;
17
18
public class ToolsEmfUiPlugin implements BundleActivator {
19
	// The plug-in ID
20
	public static final String PLUGIN_ID = "org.eclipse.e4.tools.emf.ui"; //$NON-NLS-1$
21
22
	private static ToolsEmfUiPlugin plugin;
23
24
	public static DialogSettings dialogSettings;
25
26
	public void start(BundleContext context) throws Exception {
27
		plugin = this;
28
	}
29
30
	public void stop(BundleContext context) throws Exception {
31
		plugin = null;
32
	}
33
34
	/**
35
	 * Returns the shared instance
36
	 * 
37
	 * @return the shared instance
38
	 */
39
	public static ToolsEmfUiPlugin getDefault() {
40
		return plugin;
41
	}
42
43
	/**
44
	 * @see AbstractUiPlugin#getDialogSettings()
45
	 * @return the dialog settings
46
	 */
47
	public IDialogSettings getDialogSettings() {
48
		if (dialogSettings == null)
49
			loadDialogSettings();
50
		return dialogSettings;
51
	}
52
53
	private void loadDialogSettings() {
54
		// copy from AbstracUiPlugin
55
		dialogSettings = new DialogSettings(PLUGIN_ID);
56
	}
57
58
}
(-)a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractCommandSelectionDialog.java (+8 lines)
Lines 7-12 Link Here
7
 *
7
 *
8
 * Contributors:
8
 * Contributors:
9
 *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
9
 *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
10
 *     Marco Descher <marco@descher.at> - Bug395283
10
 ******************************************************************************/
11
 ******************************************************************************/
11
package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
12
package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
12
13
Lines 15-20 Link Here
15
import org.eclipse.e4.tools.emf.ui.common.IModelResource;
16
import org.eclipse.e4.tools.emf.ui.common.IModelResource;
16
import org.eclipse.e4.tools.emf.ui.internal.Messages;
17
import org.eclipse.e4.tools.emf.ui.internal.Messages;
17
import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
18
import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
19
import org.eclipse.e4.tools.emf.ui.internal.ToolsEmfUiPlugin;
18
import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory;
20
import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory;
19
import org.eclipse.e4.ui.model.application.commands.MCommand;
21
import org.eclipse.e4.ui.model.application.commands.MCommand;
20
import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
22
import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
Lines 23-28 Link Here
23
import org.eclipse.emf.ecore.EObject;
25
import org.eclipse.emf.ecore.EObject;
24
import org.eclipse.emf.ecore.util.EcoreUtil;
26
import org.eclipse.emf.ecore.util.EcoreUtil;
25
import org.eclipse.emf.edit.domain.EditingDomain;
27
import org.eclipse.emf.edit.domain.EditingDomain;
28
import org.eclipse.jface.dialogs.IDialogSettings;
26
import org.eclipse.jface.dialogs.TitleAreaDialog;
29
import org.eclipse.jface.dialogs.TitleAreaDialog;
27
import org.eclipse.jface.viewers.AbstractTreeViewer;
30
import org.eclipse.jface.viewers.AbstractTreeViewer;
28
import org.eclipse.jface.viewers.ArrayContentProvider;
31
import org.eclipse.jface.viewers.ArrayContentProvider;
Lines 185-188 public String getText(Object element) { Link Here
185
			return s;
188
			return s;
186
		}
189
		}
187
	}
190
	}
191
192
	@Override
193
	protected IDialogSettings getDialogBoundsSettings() {
194
		return ToolsEmfUiPlugin.getDefault().getDialogSettings();
195
	}
188
}
196
}
(-)a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/AbstractIconDialog.java (+8 lines)
Lines 7-12 Link Here
7
 *
7
 *
8
 * Contributors:
8
 * Contributors:
9
 *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
9
 *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
10
 *     Marco Descher <marco@descher.at> - Bug395283
10
 ******************************************************************************/
11
 ******************************************************************************/
11
package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
12
package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
12
13
Lines 28-39 Link Here
28
import org.eclipse.core.runtime.CoreException;
29
import org.eclipse.core.runtime.CoreException;
29
import org.eclipse.e4.tools.emf.ui.internal.Messages;
30
import org.eclipse.e4.tools.emf.ui.internal.Messages;
30
import org.eclipse.e4.tools.emf.ui.internal.StringMatcher;
31
import org.eclipse.e4.tools.emf.ui.internal.StringMatcher;
32
import org.eclipse.e4.tools.emf.ui.internal.ToolsEmfUiPlugin;
31
import org.eclipse.e4.ui.model.application.MApplicationElement;
33
import org.eclipse.e4.ui.model.application.MApplicationElement;
32
import org.eclipse.emf.common.command.Command;
34
import org.eclipse.emf.common.command.Command;
33
import org.eclipse.emf.ecore.EStructuralFeature;
35
import org.eclipse.emf.ecore.EStructuralFeature;
34
import org.eclipse.emf.edit.command.SetCommand;
36
import org.eclipse.emf.edit.command.SetCommand;
35
import org.eclipse.emf.edit.domain.EditingDomain;
37
import org.eclipse.emf.edit.domain.EditingDomain;
36
import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
38
import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
39
import org.eclipse.jface.dialogs.IDialogSettings;
37
import org.eclipse.jface.dialogs.TitleAreaDialog;
40
import org.eclipse.jface.dialogs.TitleAreaDialog;
38
import org.eclipse.jface.viewers.DoubleClickEvent;
41
import org.eclipse.jface.viewers.DoubleClickEvent;
39
import org.eclipse.jface.viewers.IDoubleClickListener;
42
import org.eclipse.jface.viewers.IDoubleClickListener;
Lines 315-318 public boolean visit(IResource resource) throws CoreException { Link Here
315
			}
318
			}
316
		}
319
		}
317
	}
320
	}
321
322
	@Override
323
	protected IDialogSettings getDialogBoundsSettings() {
324
		return ToolsEmfUiPlugin.getDefault().getDialogSettings();
325
	}
318
}
326
}
(-)a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/CommandCategorySelectionDialog.java (-4 / +9 lines)
Lines 7-22 Link Here
7
 *
7
 *
8
 * Contributors:
8
 * Contributors:
9
 *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
9
 *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
10
 *     Marco Descher <marco@descher.at> - Bug395283
10
 ******************************************************************************/
11
 ******************************************************************************/
11
package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
12
package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
12
13
13
import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory;
14
15
import java.util.ArrayList;
14
import java.util.ArrayList;
16
import java.util.List;
15
import java.util.List;
17
import org.eclipse.e4.tools.emf.ui.common.IModelResource;
16
import org.eclipse.e4.tools.emf.ui.common.IModelResource;
18
import org.eclipse.e4.tools.emf.ui.internal.Messages;
17
import org.eclipse.e4.tools.emf.ui.internal.Messages;
19
import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
18
import org.eclipse.e4.tools.emf.ui.internal.PatternFilter;
19
import org.eclipse.e4.tools.emf.ui.internal.ToolsEmfUiPlugin;
20
import org.eclipse.e4.tools.emf.ui.internal.common.component.ControlFactory;
20
import org.eclipse.e4.ui.model.application.commands.MCategory;
21
import org.eclipse.e4.ui.model.application.commands.MCategory;
21
import org.eclipse.e4.ui.model.application.commands.MCommand;
22
import org.eclipse.e4.ui.model.application.commands.MCommand;
22
import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
23
import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl;
Lines 25-30 Link Here
25
import org.eclipse.emf.ecore.EObject;
26
import org.eclipse.emf.ecore.EObject;
26
import org.eclipse.emf.ecore.util.EcoreUtil;
27
import org.eclipse.emf.ecore.util.EcoreUtil;
27
import org.eclipse.emf.edit.command.SetCommand;
28
import org.eclipse.emf.edit.command.SetCommand;
29
import org.eclipse.jface.dialogs.IDialogSettings;
28
import org.eclipse.jface.dialogs.TitleAreaDialog;
30
import org.eclipse.jface.dialogs.TitleAreaDialog;
29
import org.eclipse.jface.viewers.AbstractTreeViewer;
31
import org.eclipse.jface.viewers.AbstractTreeViewer;
30
import org.eclipse.jface.viewers.ArrayContentProvider;
32
import org.eclipse.jface.viewers.ArrayContentProvider;
Lines 40-47 Link Here
40
import org.eclipse.swt.SWT;
42
import org.eclipse.swt.SWT;
41
import org.eclipse.swt.events.DisposeEvent;
43
import org.eclipse.swt.events.DisposeEvent;
42
import org.eclipse.swt.events.DisposeListener;
44
import org.eclipse.swt.events.DisposeListener;
43
import org.eclipse.swt.events.ModifyEvent;
44
import org.eclipse.swt.events.ModifyListener;
45
import org.eclipse.swt.graphics.Image;
45
import org.eclipse.swt.graphics.Image;
46
import org.eclipse.swt.layout.GridData;
46
import org.eclipse.swt.layout.GridData;
47
import org.eclipse.swt.layout.GridLayout;
47
import org.eclipse.swt.layout.GridLayout;
Lines 180-183 public String getText(Object element) { Link Here
180
			return s;
180
			return s;
181
		}
181
		}
182
	}
182
	}
183
184
	@Override
185
	protected IDialogSettings getDialogBoundsSettings() {
186
		return ToolsEmfUiPlugin.getDefault().getDialogSettings();
187
	}
183
}
188
}
(-)a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/ContributionClassDialog.java (-1 / +8 lines)
Lines 8-13 Link Here
8
 * Contributors:
8
 * Contributors:
9
 *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
9
 *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
10
 *	   Lars Vogel <lars.vogel@gmail.com> - Enhancements
10
 *	   Lars Vogel <lars.vogel@gmail.com> - Enhancements
11
 *	   Marco Descher <marco@descher.at> - Bug395283
11
 ******************************************************************************/
12
 ******************************************************************************/
12
package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
13
package org.eclipse.e4.tools.emf.ui.internal.common.component.dialogs;
13
14
Lines 18-23 Link Here
18
import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionResultHandler;
19
import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.ContributionResultHandler;
19
import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.Filter;
20
import org.eclipse.e4.tools.emf.ui.common.IClassContributionProvider.Filter;
20
import org.eclipse.e4.tools.emf.ui.internal.Messages;
21
import org.eclipse.e4.tools.emf.ui.internal.Messages;
22
import org.eclipse.e4.tools.emf.ui.internal.ToolsEmfUiPlugin;
21
import org.eclipse.e4.tools.emf.ui.internal.common.ClassContributionCollector;
23
import org.eclipse.e4.tools.emf.ui.internal.common.ClassContributionCollector;
22
import org.eclipse.e4.ui.model.application.MApplicationElement;
24
import org.eclipse.e4.ui.model.application.MApplicationElement;
23
import org.eclipse.emf.common.command.Command;
25
import org.eclipse.emf.common.command.Command;
Lines 25-30 Link Here
25
import org.eclipse.emf.edit.command.SetCommand;
27
import org.eclipse.emf.edit.command.SetCommand;
26
import org.eclipse.emf.edit.domain.EditingDomain;
28
import org.eclipse.emf.edit.domain.EditingDomain;
27
import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
29
import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
30
import org.eclipse.jface.dialogs.IDialogSettings;
28
import org.eclipse.jface.dialogs.TitleAreaDialog;
31
import org.eclipse.jface.dialogs.TitleAreaDialog;
29
import org.eclipse.jface.viewers.DoubleClickEvent;
32
import org.eclipse.jface.viewers.DoubleClickEvent;
30
import org.eclipse.jface.viewers.IDoubleClickListener;
33
import org.eclipse.jface.viewers.IDoubleClickListener;
Lines 224-227 public void result(ContributionData data) { Link Here
224
		}
227
		}
225
228
226
	}
229
	}
230
231
	@Override
232
	protected IDialogSettings getDialogBoundsSettings() {
233
		return ToolsEmfUiPlugin.getDefault().getDialogSettings();
234
	}
227
}
235
}
228
- 

Return to bug 395283