summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-07-27 00:41:11 (EDT)
committerEike Stepper2007-07-27 00:41:11 (EDT)
commit53a9642f3be80ae01221f6722de89557b503a4fe (patch)
tree4b8543121bdc1ee281ba372e6a8daa40ef9727c2
parenteff777819b56d2e758b40ebe78c6bbaa2fdef9c4 (diff)
downloadcdo-53a9642f3be80ae01221f6722de89557b503a4fe.zip
cdo-53a9642f3be80ae01221f6722de89557b503a4fe.tar.gz
cdo-53a9642f3be80ae01221f6722de89557b503a4fe.tar.bz2
*** empty log message ***
-rw-r--r--plugins/org.eclipse.net4j.util/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/Value.java35
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Channel.java4
3 files changed, 3 insertions, 39 deletions
diff --git a/plugins/org.eclipse.net4j.util/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.util/META-INF/MANIFEST.MF
index 9ae8ac1..c404db0 100644
--- a/plugins/org.eclipse.net4j.util/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.util/META-INF/MANIFEST.MF
@@ -11,8 +11,7 @@ Import-Package: org.eclipse.core.runtime;resolution:=optional,
org.osgi.framework;version="1.3.0";resolution:=optional,
org.osgi.service.log;version="1.3.0";resolution:=optional,
org.osgi.util.tracker;version="1.3.0";resolution:=optional
-Export-Package: org.eclipse.net4j.internal.util;version="0.8.0",
- org.eclipse.net4j.internal.util.collection;version="0.8.0",
+Export-Package: org.eclipse.net4j.internal.util.collection;version="0.8.0",
org.eclipse.net4j.internal.util.concurrent;version="0.8.0",
org.eclipse.net4j.internal.util.container;version="0.8.0",
org.eclipse.net4j.internal.util.container.delegate;version="0.8.0",
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/Value.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/Value.java
deleted file mode 100644
index 388d6ff..0000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/Value.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/***************************************************************************
- * 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.internal.util;
-
-import java.io.Serializable;
-
-/**
- * @author Eike Stepper
- */
-public abstract class Value implements Cloneable, Serializable
-{
- protected Value()
- {
- }
-
- @Override
- protected abstract Object clone() throws CloneNotSupportedException;
-
- @Override
- public abstract boolean equals(Object obj);
-
- @Override
- public abstract int hashCode();
-
- @Override
- public abstract String toString();
-}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Channel.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Channel.java
index 967f301..a614acb 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Channel.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Channel.java
@@ -17,7 +17,6 @@ import org.eclipse.net4j.IBufferProvider;
import org.eclipse.net4j.IChannel;
import org.eclipse.net4j.IChannelID;
import org.eclipse.net4j.IConnector;
-import org.eclipse.net4j.internal.util.Value;
import org.eclipse.net4j.internal.util.concurrent.AsynchronousWorkSerializer;
import org.eclipse.net4j.internal.util.concurrent.SynchronousWorkSerializer;
import org.eclipse.net4j.internal.util.lifecycle.Lifecycle;
@@ -27,6 +26,7 @@ import org.eclipse.net4j.util.concurrent.IWorkSerializer;
import org.eclipse.internal.net4j.bundle.OM;
+import java.io.Serializable;
import java.text.MessageFormat;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
@@ -240,7 +240,7 @@ public class Channel extends Lifecycle implements IChannel, IBufferProvider
/**
* @author Eike Stepper
*/
- private final class ChannelIDImpl extends Value implements IChannelID
+ private final class ChannelIDImpl implements IChannelID, Cloneable, Serializable
{
private static final long serialVersionUID = 1L;