Attachment 203280 Details for Bug 357136 – Remove name model from UITopicBase

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Remove name model from UITopicBase

bug357136.txt (text/plain), 3.27 KB, created by Dean Roberts

on 2011-09-13 14:26:02 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Dean Roberts

Created: 2011-09-13 14:26:02 EDT

Size: 3.27 KB

patch

obsolete

>diff --git src/org/eclipse/e4/ui/internal/workbench/swt/GenTopic.java src/org/eclipse/e4/ui/internal/workbench/swt/GenTopic.java
>index ce6eca5..ee8cce8 100644
>--- src/org/eclipse/e4/ui/internal/workbench/swt/GenTopic.java
>+++ src/org/eclipse/e4/ui/internal/workbench/swt/GenTopic.java
>@@ -89,7 +89,8 @@
> 						+ "\npublic class UIEvents {" //$NON-NLS-1$
> 						+ "\n\tpublic static final String TOPIC_SEP = \"/\"; //$NON-NLS-1$" //$NON-NLS-1$
> 						+ "\n\tpublic static final String ALL_SUB_TOPICS = \"*\"; //$NON-NLS-1$" //$NON-NLS-1$
>-						+ "\n\tpublic static final String UITopicBase = \"org/eclipse/e4/ui/model\"; //$NON-NLS-1$" //$NON-NLS-1$
>+						+ "\n\tpublic static final String UITopicBase = \"org/eclipse/e4/ui\"; //$NON-NLS-1$" //$NON-NLS-1$
>+						+ "\n\tpublic static final String UIModelTopicBase = UITopicBase + \"/model\"; //$NON-NLS-1$" //$NON-NLS-1$
> 						+ "\n\tpublic static interface EventTypes {" //$NON-NLS-1$
> 						+ "\n\t\tpublic static final String CREATE = \"CREATE\"; //$NON-NLS-1$" //$NON-NLS-1$
> 						+ "\n\t\tpublic static final String SET = \"SET\"; //$NON-NLS-1$" //$NON-NLS-1$
>@@ -113,9 +114,10 @@
> 		}
> 		String pkgName = eClass.getEPackage().getName();
> 		String className = eClass.getName();
>-		System.out.print("\n\tpublic static interface " + className + " {" //$NON-NLS-1$ //$NON-NLS-2$
>-				+ "\n\t\tpublic static final String TOPIC = UITopicBase + \"/" //$NON-NLS-1$
>-				+ pkgName + '/' + className + "\"; //$NON-NLS-1$"); //$NON-NLS-1$
>+		System.out
>+				.print("\n\tpublic static interface " + className + " {" //$NON-NLS-1$ //$NON-NLS-2$
>+						+ "\n\t\tpublic static final String TOPIC = UIModelTopicBase + \"/" //$NON-NLS-1$
>+						+ pkgName + '/' + className + "\"; //$NON-NLS-1$"); //$NON-NLS-1$
> 		Set<String> names = new TreeSet<String>();
> 		for (EStructuralFeature feature : features) {
> 			names.add(feature.getName());
>diff --git src/org/eclipse/e4/ui/internal/workbench/UIEventPublisher.java src/org/eclipse/e4/ui/internal/workbench/UIEventPublisher.java
>index b958bd8..cd471ec 100644
>--- src/org/eclipse/e4/ui/internal/workbench/UIEventPublisher.java
>+++ src/org/eclipse/e4/ui/internal/workbench/UIEventPublisher.java
>@@ -32,10 +32,7 @@
> 	private IEclipseContext context;
> 
> 	/**
>-	 * Constructor.
>-	 * 
> 	 * @param e4Context
>-	 * @param partList
> 	 */
> 	public UIEventPublisher(IEclipseContext e4Context) {
> 		this.context = e4Context;
>@@ -61,11 +58,6 @@
> 		}
> 	}
> 
>-	/**
>-	 * @param notification
>-	 * @param argMap
>-	 * @return
>-	 */
> 	private String formatData(Notification notification, Map<String, Object> argMap) {
> 		// The unchecked casts below represent 'asserts'
> 		MApplicationElement appElement = (MApplicationElement) notification.getNotifier();
>@@ -109,8 +101,9 @@
> 	 */
> 	private String getTopic(EStructuralFeature eFeature, String type) {
> 		EClass eContainingClass = eFeature.getEContainingClass();
>-		return UIEvents.UITopicBase + UIEvents.TOPIC_SEP + eContainingClass.getEPackage().getName()
>-				+ UIEvents.TOPIC_SEP + eContainingClass.getName() + UIEvents.TOPIC_SEP
>-				+ eFeature.getName() + UIEvents.TOPIC_SEP + type;
>+		return UIEvents.UIModelTopicBase + UIEvents.TOPIC_SEP
>+				+ eContainingClass.getEPackage().getName() + UIEvents.TOPIC_SEP
>+				+ eContainingClass.getName() + UIEvents.TOPIC_SEP + eFeature.getName()
>+				+ UIEvents.TOPIC_SEP + type;
> 	}
> }

Actions: View | Diff

Attachments on bug 357136: 203280 | 203282