summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-03-03 03:04:10 (EST)
committerEike Stepper2007-03-03 03:04:10 (EST)
commit0b7d5c3e7989691e4142c0989e1a2baf2d9cbab2 (patch)
tree138110311aa864d9856be30c490340fe90a74858
parent91564cb4cfe12d14600f9e169c9083c2c352430a (diff)
downloadcdo-0b7d5c3e7989691e4142c0989e1a2baf2d9cbab2.zip
cdo-0b7d5c3e7989691e4142c0989e1a2baf2d9cbab2.tar.gz
cdo-0b7d5c3e7989691e4142c0989e1a2baf2d9cbab2.tar.bz2
*** empty log message ***
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOSessionsView.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/wizards/NewEditorWizardPage.java22
-rw-r--r--plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/RemoteTraceManager.java3
-rw-r--r--plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPAcceptorImpl.java6
-rw-r--r--plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelectorImpl.java2
-rw-r--r--plugins/org.eclipse.net4j/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/AbstractAcceptor.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/AbstractConnector.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/AbstractProtocol.java3
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/ChannelImpl.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/lifecycle/LifecycleImpl.java (renamed from plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/lifecycle/LifecycleImpl.java)5
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/lifecycle/NotifyingLifecycleImpl.java49
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/ReflectUtil.java2
13 files changed, 79 insertions, 26 deletions
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOSessionsView.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOSessionsView.java
index 1cf8c3e..fa7baf7 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOSessionsView.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOSessionsView.java
@@ -115,10 +115,8 @@ public class CDOSessionsView extends StructuredView
openEditorAction.setSession((CDOSession)selectedElement);
openEditorAction.run();
}
- else
- {
- super.onDoubleClick(selectedElement);
- }
+
+ super.onDoubleClick(selectedElement);
}
private static final class NameSorter extends ViewerSorter
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/wizards/NewEditorWizardPage.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/wizards/NewEditorWizardPage.java
index 95ea5bd..66a05a5 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/wizards/NewEditorWizardPage.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/wizards/NewEditorWizardPage.java
@@ -181,17 +181,17 @@ public class NewEditorWizardPage extends WizardPage
}
}
-// if (connectorText.isEnabled() && connectorText.getText().length() == 0)
-// {
-// updateStatus("Enter a description to create a new connector.");
-// return;
-// }
-//
-// if (repositoryText.getText().length() == 0)
-// {
-// updateStatus("Enter the name of a remote repository.");
-// return;
-// }
+ // if (connectorText.isEnabled() && connectorText.getText().length() == 0)
+ // {
+ // updateStatus("Enter a description to create a new connector.");
+ // return;
+ // }
+ //
+ // if (repositoryText.getText().length() == 0)
+ // {
+ // updateStatus("Enter the name of a remote repository.");
+ // return;
+ // }
updateStatus(null);
}
diff --git a/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/RemoteTraceManager.java b/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/RemoteTraceManager.java
index 46de575..3b86e3f 100644
--- a/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/RemoteTraceManager.java
+++ b/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/RemoteTraceManager.java
@@ -11,12 +11,13 @@
package org.eclipse.net4j.internal.debug;
import org.eclipse.net4j.internal.debug.views.RemoteTraceView;
-import org.eclipse.net4j.util.lifecycle.LifecycleImpl;
import org.eclipse.net4j.util.lifecycle.Singleton;
import org.eclipse.net4j.util.om.trace.RemoteTraceServer;
import org.eclipse.net4j.util.om.trace.RemoteTraceServer.Event;
import org.eclipse.net4j.util.om.trace.RemoteTraceServer.Listener;
+import org.eclipse.internal.net4j.util.lifecycle.LifecycleImpl;
+
import java.util.ArrayList;
import java.util.List;
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPAcceptorImpl.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPAcceptorImpl.java
index cc48fbe..41cb948 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPAcceptorImpl.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPAcceptorImpl.java
@@ -38,7 +38,7 @@ public class TCPAcceptorImpl extends AbstractAcceptor implements TCPAcceptor, TC
private static final String DEFAULT_ADDRESS = "0.0.0.0";
- private TCPSelector selector;
+ private TCPSelectorImpl selector;
private ServerSocketChannel serverSocketChannel;
@@ -60,12 +60,12 @@ public class TCPAcceptorImpl extends AbstractAcceptor implements TCPAcceptor, TC
return port;
}
- public TCPSelector getSelector()
+ public TCPSelectorImpl getSelector()
{
return selector;
}
- public void setSelector(TCPSelector selector)
+ public void setSelector(TCPSelectorImpl selector)
{
this.selector = selector;
}
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelectorImpl.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelectorImpl.java
index 91ca8e5..70eeb49 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelectorImpl.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelectorImpl.java
@@ -14,10 +14,10 @@ import org.eclipse.net4j.tcp.TCPSelector;
import org.eclipse.net4j.tcp.TCPSelectorListener;
import org.eclipse.net4j.tcp.TCPSelectorListener.Active;
import org.eclipse.net4j.tcp.TCPSelectorListener.Passive;
-import org.eclipse.net4j.util.lifecycle.LifecycleImpl;
import org.eclipse.net4j.util.om.trace.ContextTracer;
import org.eclipse.internal.net4j.bundle.Net4j;
+import org.eclipse.internal.net4j.util.lifecycle.LifecycleImpl;
import java.io.IOException;
import java.nio.channels.CancelledKeyException;
diff --git a/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF
index 6fc13a2..de31793 100644
--- a/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF
@@ -16,6 +16,7 @@ Export-Package: org.eclipse.internal.net4j.bundle;version="0.8.0",
org.eclipse.internal.net4j.util;version="0.8.0",
org.eclipse.internal.net4j.util.concurrent;version="0.8.0",
org.eclipse.internal.net4j.util.event;version="0.8.0",
+ org.eclipse.internal.net4j.util.lifecycle;version="0.8.0",
org.eclipse.internal.net4j.util.om;version="0.8.0",
org.eclipse.internal.net4j.util.registry;version="0.8.0",
org.eclipse.net4j;version="0.8.0",
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/AbstractAcceptor.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/AbstractAcceptor.java
index 97bd006..435ee25 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/AbstractAcceptor.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/AbstractAcceptor.java
@@ -19,7 +19,6 @@ import org.eclipse.net4j.transport.ProtocolFactory;
import org.eclipse.net4j.transport.ProtocolFactoryID;
import org.eclipse.net4j.util.event.IListener;
import org.eclipse.net4j.util.event.INotifier;
-import org.eclipse.net4j.util.lifecycle.LifecycleImpl;
import org.eclipse.net4j.util.lifecycle.LifecycleListener;
import org.eclipse.net4j.util.lifecycle.LifecycleNotifier;
import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
@@ -29,6 +28,7 @@ import org.eclipse.net4j.util.registry.IRegistry;
import org.eclipse.internal.net4j.bundle.Net4j;
import org.eclipse.internal.net4j.util.event.EventImpl;
import org.eclipse.internal.net4j.util.event.NotifierImpl;
+import org.eclipse.internal.net4j.util.lifecycle.LifecycleImpl;
import java.nio.channels.Channel;
import java.util.HashSet;
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/AbstractConnector.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/AbstractConnector.java
index 20f719b..dbdf265 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/AbstractConnector.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/AbstractConnector.java
@@ -25,7 +25,6 @@ import org.eclipse.net4j.transport.ProtocolFactory;
import org.eclipse.net4j.transport.ProtocolFactoryID;
import org.eclipse.net4j.util.event.IListener;
import org.eclipse.net4j.util.event.INotifier;
-import org.eclipse.net4j.util.lifecycle.LifecycleImpl;
import org.eclipse.net4j.util.lifecycle.LifecycleListener;
import org.eclipse.net4j.util.lifecycle.LifecycleNotifier;
import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
@@ -35,6 +34,7 @@ import org.eclipse.net4j.util.registry.IRegistry;
import org.eclipse.internal.net4j.bundle.Net4j;
import org.eclipse.internal.net4j.util.event.EventImpl;
import org.eclipse.internal.net4j.util.event.NotifierImpl;
+import org.eclipse.internal.net4j.util.lifecycle.LifecycleImpl;
import java.util.ArrayList;
import java.util.List;
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/AbstractProtocol.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/AbstractProtocol.java
index a984681..e9abd08 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/AbstractProtocol.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/AbstractProtocol.java
@@ -14,7 +14,8 @@ import org.eclipse.net4j.transport.Buffer;
import org.eclipse.net4j.transport.BufferProvider;
import org.eclipse.net4j.transport.Channel;
import org.eclipse.net4j.transport.Protocol;
-import org.eclipse.net4j.util.lifecycle.LifecycleImpl;
+
+import org.eclipse.internal.net4j.util.lifecycle.LifecycleImpl;
/**
* @author Eike Stepper
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/ChannelImpl.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/ChannelImpl.java
index 6f7afc1..b107650 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/ChannelImpl.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/ChannelImpl.java
@@ -18,7 +18,6 @@ import org.eclipse.net4j.transport.ChannelID;
import org.eclipse.net4j.transport.Connector;
import org.eclipse.net4j.util.ObjectUtil;
import org.eclipse.net4j.util.concurrent.IWorkSerializer;
-import org.eclipse.net4j.util.lifecycle.LifecycleImpl;
import org.eclipse.net4j.util.om.trace.ContextTracer;
import org.eclipse.net4j.util.registry.IRegistry;
@@ -27,6 +26,7 @@ import org.eclipse.internal.net4j.transport.BufferImpl.State;
import org.eclipse.internal.net4j.util.Value;
import org.eclipse.internal.net4j.util.concurrent.AsynchronousWorkSerializer;
import org.eclipse.internal.net4j.util.concurrent.SynchronousWorkSerializer;
+import org.eclipse.internal.net4j.util.lifecycle.LifecycleImpl;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/lifecycle/LifecycleImpl.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/lifecycle/LifecycleImpl.java
index 7822d50..0d490e4 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/lifecycle/LifecycleImpl.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/lifecycle/LifecycleImpl.java
@@ -8,9 +8,12 @@
* Contributors:
* Eike Stepper - initial API and implementation
**************************************************************************/
-package org.eclipse.net4j.util.lifecycle;
+package org.eclipse.internal.net4j.util.lifecycle;
import org.eclipse.net4j.util.ReflectUtil;
+import org.eclipse.net4j.util.lifecycle.Lifecycle;
+import org.eclipse.net4j.util.lifecycle.LifecycleListener;
+import org.eclipse.net4j.util.lifecycle.LifecycleNotifier;
import org.eclipse.net4j.util.om.trace.ContextTracer;
import org.eclipse.internal.net4j.bundle.Net4j;
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/lifecycle/NotifyingLifecycleImpl.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/lifecycle/NotifyingLifecycleImpl.java
new file mode 100644
index 0000000..b55b7f9
--- /dev/null
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/lifecycle/NotifyingLifecycleImpl.java
@@ -0,0 +1,49 @@
+/***************************************************************************
+ * 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.internal.net4j.util.lifecycle;
+
+import org.eclipse.net4j.util.event.IEvent;
+import org.eclipse.net4j.util.event.IListener;
+import org.eclipse.net4j.util.event.INotifier;
+
+import org.eclipse.internal.net4j.util.event.NotifierImpl;
+
+/**
+ * @author Eike Stepper
+ */
+public class NotifyingLifecycleImpl extends LifecycleImpl implements INotifier.Introspection
+{
+ private NotifierImpl notifier;
+
+ public NotifyingLifecycleImpl()
+ {
+ }
+
+ public void addListener(IListener listener)
+ {
+ notifier.addListener(listener);
+ }
+
+ public void removeListener(IListener listener)
+ {
+ notifier.removeListener(listener);
+ }
+
+ public IListener[] getListeners()
+ {
+ return notifier.getListeners();
+ }
+
+ protected void fireEvent(IEvent event)
+ {
+ notifier.fireEvent(event);
+ }
+}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/ReflectUtil.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/ReflectUtil.java
index 393aa65..95c45c7 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/ReflectUtil.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/ReflectUtil.java
@@ -10,7 +10,7 @@
**************************************************************************/
package org.eclipse.net4j.util;
-import org.eclipse.net4j.util.lifecycle.LifecycleImpl;
+import org.eclipse.internal.net4j.util.lifecycle.LifecycleImpl;
import java.io.PrintStream;
import java.lang.reflect.Field;