task 1: Develop 0.8.0

4 files changed, 33 insertions, 20 deletions

diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOItemProvider.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOItemProvider.java
index de81ee3980..3a2485450e 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOItemProvider.java
@@ -57,8 +57,7 @@ public class CDOItemProvider extends ContainerItemProvider
       {
         try
         {
-          CDOViewEvent e = (CDOViewEvent)event;
-          final CDOView view = e.getView();
+          final CDOView view = ((CDOViewEvent)event).getView();
           getViewer().getControl().getDisplay().syncExec(new Runnable()
           {
             public void run()
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorChannelsEvent.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorChannelsEvent.java
index 24994133e7..8e40ed8e98 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorChannelsEvent.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorChannelsEvent.java
@@ -23,16 +23,9 @@ import org.eclipse.net4j.util.container.IContainerEvent;
  * @author Eike Stepper
  * @since 0.8.0
  */
-public interface IConnectorChannelsEvent extends IContainerEvent<IChannel>
+public interface IConnectorChannelsEvent extends IConnectorEvent, IContainerEvent<IChannel>
 {
   /**
-   * The {@link IConnector} that sent this event.
-   * 
-   * @see IContainerEvent#getContainer()
-   */
-  public IConnector getConnector();
-
-  /**
    * The {@link IChannel} of the first {@link IContainerDelta} of this event.
    * 
    * @see IContainerEvent#getDeltaElement()
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorEvent.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorEvent.java
new file mode 100644
index 0000000000..70a71434ec
--- /dev/null
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorEvent.java
@@ -0,0 +1,30 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2007 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ **************************************************************************/
+package org.eclipse.net4j;
+
+import org.eclipse.net4j.util.container.IContainerEvent;
+import org.eclipse.net4j.util.event.IEvent;
+
+/**
+ * An event that is fired by an {@link IConnector}.
+ * 
+ * @author Eike Stepper
+ * @since 0.8.0
+ */
+public interface IConnectorEvent extends IEvent
+{
+  /**
+   * The {@link IConnector} that sent this event.
+   * 
+   * @see IContainerEvent#getContainer()
+   */
+  public IConnector getConnector();
+}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorStateEvent.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorStateEvent.java
index a9b1a7bdba..7e5f0aaafd 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorStateEvent.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorStateEvent.java
@@ -10,8 +10,6 @@
  **************************************************************************/
 package org.eclipse.net4j;
 
-import org.eclipse.net4j.util.container.IContainerEvent;
-import org.eclipse.net4j.util.event.IEvent;
 
 /**
  * An event that is fired by an {@link IConnector} to indicate that its state
@@ -20,16 +18,9 @@ import org.eclipse.net4j.util.event.IEvent;
  * @author Eike Stepper
  * @since 0.8.0
  */
-public interface IConnectorStateEvent extends IEvent
+public interface IConnectorStateEvent extends IConnectorEvent
 {
   /**
-   * The {@link IConnector} that sent this event.
-   * 
-   * @see IContainerEvent#getContainer()
-   */
-  public IConnector getConnector();
-
-  /**
    * The old state of the {@link IConnector} that sent this event.
    */
   public ConnectorState getOldState();