aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Elder2013-11-18 13:00:06 (EST)
committerPaul Elder2013-11-18 13:00:06 (EST)
commitfa91fd45ca025787f1bf6e04e7e042ad7424c2ec (patch)
treeb676523ea641436393ae3fe1597b53922a279c3f
parent2b32ff06f55839f5f109e11ffbbf1e76bd581c48 (diff)
downloadeclipse.platform.ui-fa91fd45ca025787f1bf6e04e7e042ad7424c2ec.zip
eclipse.platform.ui-fa91fd45ca025787f1bf6e04e7e042ad7424c2ec.tar.gz
eclipse.platform.ui-fa91fd45ca025787f1bf6e04e7e042ad7424c2ec.tar.bz2
bug 421462: [Model] Enable representation of dialogs and wizards in therefs/changes/16/18516/1
E4 model Regenerate UIEvents from the ecore model. Change-Id: I54af0bd14c0c149e36a380140b5f497530c206a4
-rw-r--r--bundles/org.eclipse.e4.ui.workbench/.settings/.api_filters19
-rw-r--r--bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/workbench/UIEvents.java29
2 files changed, 45 insertions, 3 deletions
diff --git a/bundles/org.eclipse.e4.ui.workbench/.settings/.api_filters b/bundles/org.eclipse.e4.ui.workbench/.settings/.api_filters
index 18046ae..6a3abe8 100644
--- a/bundles/org.eclipse.e4.ui.workbench/.settings/.api_filters
+++ b/bundles/org.eclipse.e4.ui.workbench/.settings/.api_filters
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.e4.ui.workbench" version="2">
+<?xml version="1.0" encoding="UTF-8"?><component id="org.eclipse.e4.ui.workbench" version="2">
<resource path="META-INF/MANIFEST.MF">
<filter comment="Bug 411257 - .api_description files in Kepler release do not contain @noreference" id="923795461">
<message_arguments>
@@ -8,6 +7,20 @@
</message_arguments>
</filter>
</resource>
+ <resource path="src/org/eclipse/e4/ui/workbench/UIEvents.java" type="org.eclipse.e4.ui.workbench.UIEvents$Application">
+ <filter comment="New dialogs field in MApplication" id="403767336">
+ <message_arguments>
+ <message_argument value="org.eclipse.e4.ui.workbench.UIEvents.Application"/>
+ <message_argument value="DIALOGS"/>
+ </message_arguments>
+ </filter>
+ <filter comment="New dialogs field in MApplication" id="403767336">
+ <message_arguments>
+ <message_argument value="org.eclipse.e4.ui.workbench.UIEvents.Application"/>
+ <message_argument value="TOPIC_DIALOGS"/>
+ </message_arguments>
+ </filter>
+ </resource>
<resource path="src/org/eclipse/e4/ui/workbench/UIEvents.java" type="org.eclipse.e4.ui.workbench.UIEvents$UILifeCycle">
<filter comment="All of the subinterfaces shouldn't be subclassed either" id="403767336">
<message_arguments>
@@ -298,4 +311,4 @@
</message_arguments>
</filter>
</resource>
-</component>
+</component> \ No newline at end of file
diff --git a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/workbench/UIEvents.java b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/workbench/UIEvents.java
index 48ff386..05c58b9 100644
--- a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/workbench/UIEvents.java
+++ b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/workbench/UIEvents.java
@@ -601,6 +601,9 @@ public class UIEvents {
public static final String DESCRIPTORS = "descriptors"; //$NON-NLS-1$
}
+ /**
+ * @since 1.1
+ */
@SuppressWarnings("javadoc")
public static interface Application {
@@ -613,11 +616,19 @@ public class UIEvents {
public static final String TOPIC_ADDONS = "org/eclipse/e4/ui/model/application/Application/addons/*"; //$NON-NLS-1$
public static final String TOPIC_CATEGORIES = "org/eclipse/e4/ui/model/application/Application/categories/*"; //$NON-NLS-1$
public static final String TOPIC_COMMANDS = "org/eclipse/e4/ui/model/application/Application/commands/*"; //$NON-NLS-1$
+ /**
+ * @since 1.1
+ */
+ public static final String TOPIC_DIALOGS = "org/eclipse/e4/ui/model/application/Application/dialogs/*"; //$NON-NLS-1$
// Attributes that can be tested in event handlers
public static final String ADDONS = "addons"; //$NON-NLS-1$
public static final String CATEGORIES = "categories"; //$NON-NLS-1$
public static final String COMMANDS = "commands"; //$NON-NLS-1$
+ /**
+ * @since 1.1
+ */
+ public static final String DIALOGS = "dialogs"; //$NON-NLS-1$
}
@SuppressWarnings("javadoc")
@@ -747,6 +758,24 @@ public class UIEvents {
public static final String TOOLBAR = "toolbar"; //$NON-NLS-1$
}
+ /**
+ * @since 1.1
+ */
+ @SuppressWarnings("javadoc")
+ public static interface TrimBar {
+
+ // Topics that can be subscribed to
+
+ @Deprecated
+ public static final String TOPIC = "org/eclipse/e4/ui/model/basic/TrimBar"; //$NON-NLS-1$
+
+ public static final String TOPIC_ALL = "org/eclipse/e4/ui/model/basic/TrimBar/*"; //$NON-NLS-1$
+ public static final String TOPIC_PENDINGCLEANUP = "org/eclipse/e4/ui/model/basic/TrimBar/pendingCleanup/*"; //$NON-NLS-1$
+
+ // Attributes that can be tested in event handlers
+ public static final String PENDINGCLEANUP = "pendingCleanup"; //$NON-NLS-1$
+ }
+
@SuppressWarnings("javadoc")
public static interface TrimmedWindow {