diff options
12 files changed, 102 insertions, 60 deletions
diff --git a/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF index ad347310eb..2449e16f2f 100644 --- a/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF @@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.emf.edit.ui;bundle-version="[2.4.0,3.0.0)";visibility:=reexport, org.eclipse.emf.ecore.edit;bundle-version="[2.4.0,3.0.0)";visibility:=reexport, org.eclipse.net4j;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, - org.eclipse.net4j.util.ui;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, + org.eclipse.net4j.util.ui;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, org.eclipse.emf.cdo;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, org.eclipse.emf.cdo.edit;bundle-version="[2.0.0,3.0.0)" Export-Package: org.eclipse.emf.cdo.internal.ui;version="2.0.0";x-internal:=true, diff --git a/plugins/org.eclipse.net4j.buddies.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.buddies.ui/META-INF/MANIFEST.MF index ebe753a753..a8f1beedf4 100644 --- a/plugins/org.eclipse.net4j.buddies.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j.buddies.ui/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.ui;bundle-version="[3.4.0,4.0.0)";visibility:=reexport, org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)";visibility:=reexport, org.eclipse.net4j;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, - org.eclipse.net4j.util.ui;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, + org.eclipse.net4j.util.ui;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, org.eclipse.net4j.buddies;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, org.eclipse.net4j.buddies.chat;bundle-version="[2.0.0,3.0.0)";resolution:=optional Export-Package: org.eclipse.net4j.buddies.internal.ui;version="2.0.0", diff --git a/plugins/org.eclipse.net4j.db/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.db/META-INF/MANIFEST.MF index 39940e6ef6..b5b3539951 100644 --- a/plugins/org.eclipse.net4j.db/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j.db/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Bundle-ClassPath: . Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", - org.eclipse.net4j.util;bundle-version="[1.0.0,2.0.0)";visibility:=reexport + org.eclipse.net4j.util;bundle-version="[2.0.0,3.0.0)";visibility:=reexport Export-Package: org.eclipse.net4j.db;version="2.0.0", org.eclipse.net4j.db.ddl;version="2.0.0", org.eclipse.net4j.db.dml;version="2.0.0", diff --git a/plugins/org.eclipse.net4j.debug/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.debug/META-INF/MANIFEST.MF index 7e4ad37dae..6b99f33f2a 100644 --- a/plugins/org.eclipse.net4j.debug/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j.debug/META-INF/MANIFEST.MF @@ -9,5 +9,5 @@ Bundle-ClassPath: . Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", - org.eclipse.net4j.util.ui;bundle-version="[1.0.0,2.0.0)";visibility:=reexport + org.eclipse.net4j.util.ui;bundle-version="[2.0.0,3.0.0)";visibility:=reexport Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/internal/http/HTTPClientConnector.java b/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/internal/http/HTTPClientConnector.java index a67a8cf815..0ea3f1c9e4 100644 --- a/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/internal/http/HTTPClientConnector.java +++ b/plugins/org.eclipse.net4j.http/src/org/eclipse/net4j/internal/http/HTTPClientConnector.java @@ -15,8 +15,8 @@ import org.eclipse.net4j.connector.ConnectorLocation; import org.eclipse.net4j.http.internal.common.HTTPConnector; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; -import org.eclipse.net4j.util.io.IOAdapter; -import org.eclipse.net4j.util.io.IOHandler; +import org.eclipse.net4j.util.io.ExtendedIOAdapter; +import org.eclipse.net4j.util.io.ExtendedIOHandler; import org.eclipse.net4j.util.io.IORuntimeException; import org.eclipse.net4j.util.lifecycle.Worker; @@ -147,7 +147,7 @@ public class HTTPClientConnector extends HTTPConnector private void doConnect() throws IOException { - request(new IOHandler() + request(new ExtendedIOHandler() { public void handleOut(ExtendedDataOutputStream out) throws IOException { @@ -168,7 +168,7 @@ public class HTTPClientConnector extends HTTPConnector private void doDisconnect() throws IOException { - request(new IOAdapter() + request(new ExtendedIOAdapter() { @Override public void handleOut(ExtendedDataOutputStream out) throws IOException @@ -179,7 +179,7 @@ public class HTTPClientConnector extends HTTPConnector }); } - private void request(IOHandler handler) throws IOException, HttpException + private void request(ExtendedIOHandler handler) throws IOException, HttpException { ByteArrayOutputStream baos = new ByteArrayOutputStream(); ExtendedDataOutputStream out = new ExtendedDataOutputStream(baos); @@ -222,7 +222,7 @@ public class HTTPClientConnector extends HTTPConnector try { final boolean moreOperations[] = { false }; - request(new IOHandler() + request(new ExtendedIOHandler() { public void handleOut(ExtendedDataOutputStream out) throws IOException { diff --git a/plugins/org.eclipse.net4j.util.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.util.ui/META-INF/MANIFEST.MF index d9a887a8d4..ab4ec8ac64 100644 --- a/plugins/org.eclipse.net4j.util.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j.util.ui/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.net4j.util.ui;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy @@ -11,15 +11,15 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ClassPath: . Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", org.eclipse.ui;bundle-version="[3.4.0,4.0.0)";visibility:=reexport, - org.eclipse.net4j.util;bundle-version="[1.0.0,2.0.0)";visibility:=reexport -Export-Package: org.eclipse.net4j.util.internal.ui;version="1.0.0", - org.eclipse.net4j.util.internal.ui.actions;version="1.0.0", - org.eclipse.net4j.util.internal.ui.security;version="1.0.0", - org.eclipse.net4j.util.internal.ui.views;version="1.0.0", - org.eclipse.net4j.util.ui;version="1.0.0", - org.eclipse.net4j.util.ui.actions;version="1.0.0", - org.eclipse.net4j.util.ui.dnd;version="1.0.0", - org.eclipse.net4j.util.ui.prefs;version="1.0.0", - org.eclipse.net4j.util.ui.proposals;version="1.0.0", - org.eclipse.net4j.util.ui.views;version="1.0.0", - org.eclipse.net4j.util.ui.widgets;version="1.0.0" + org.eclipse.net4j.util;bundle-version="[2.0.0,3.0.0)";visibility:=reexport +Export-Package: org.eclipse.net4j.util.internal.ui;version="2.0.0", + org.eclipse.net4j.util.internal.ui.actions;version="2.0.0", + org.eclipse.net4j.util.internal.ui.security;version="2.0.0", + org.eclipse.net4j.util.internal.ui.views;version="2.0.0", + org.eclipse.net4j.util.ui;version="2.0.0", + org.eclipse.net4j.util.ui.actions;version="2.0.0", + org.eclipse.net4j.util.ui.dnd;version="2.0.0", + org.eclipse.net4j.util.ui.prefs;version="2.0.0", + org.eclipse.net4j.util.ui.proposals;version="2.0.0", + org.eclipse.net4j.util.ui.views;version="2.0.0", + org.eclipse.net4j.util.ui.widgets;version="2.0.0" diff --git a/plugins/org.eclipse.net4j.util/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.util/META-INF/MANIFEST.MF index 4976026a04..8cda754d35 100644 --- a/plugins/org.eclipse.net4j.util/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j.util/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.net4j.util;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -10,33 +10,33 @@ Bundle-Activator: org.eclipse.net4j.internal.util.bundle.OM$Activator Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ClassPath: . Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";resolution:=optional -Import-Package: org.eclipse.osgi.service.debug;version="1.0.0";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.bundle;version="1.0.0";x-internal:=true, - org.eclipse.net4j.internal.util.container;version="1.0.0";x-internal:=true, - org.eclipse.net4j.internal.util.factory;version="1.0.0";x-internal:=true, - org.eclipse.net4j.internal.util.om;version="1.0.0";x-internal:=true, - org.eclipse.net4j.internal.util.om.monitor;version="1.0.0";x-internal:=true, - org.eclipse.net4j.internal.util.om.pref;version="1.0.0";x-internal:=true, - org.eclipse.net4j.util;version="1.0.0", - org.eclipse.net4j.util.cache;version="1.0.0", - org.eclipse.net4j.util.collection;version="1.0.0", - org.eclipse.net4j.util.concurrent;version="1.0.0", - org.eclipse.net4j.util.container;version="1.0.0", - org.eclipse.net4j.util.container.delegate;version="1.0.0", - org.eclipse.net4j.util.event;version="1.0.0", - org.eclipse.net4j.util.factory;version="1.0.0", - org.eclipse.net4j.util.fsm;version="1.0.0", - org.eclipse.net4j.util.io;version="1.0.0", - org.eclipse.net4j.util.lifecycle;version="1.0.0", - org.eclipse.net4j.util.om;version="1.0.0", - org.eclipse.net4j.util.om.log;version="1.0.0", - org.eclipse.net4j.util.om.monitor;version="1.0.0", - org.eclipse.net4j.util.om.pref;version="1.0.0", - org.eclipse.net4j.util.om.trace;version="1.0.0", - org.eclipse.net4j.util.ref;version="1.0.0", - org.eclipse.net4j.util.registry;version="1.0.0", - org.eclipse.net4j.util.security;version="1.0.0", - org.eclipse.net4j.util.transaction;version="1.0.0" +Import-Package: org.eclipse.osgi.service.debug;version="[1.0.0,2.0.0)";resolution:=optional, + org.osgi.framework;version="[1.3.0,2.0.0)";resolution:=optional, + org.osgi.service.log;version="[1.3.0,2.0.0)";resolution:=optional, + org.osgi.util.tracker;version="[1.3.0,2.0.0)";resolution:=optional +Export-Package: org.eclipse.net4j.internal.util.bundle;version="2.0.0";x-internal:=true, + org.eclipse.net4j.internal.util.container;version="2.0.0";x-internal:=true, + org.eclipse.net4j.internal.util.factory;version="2.0.0";x-internal:=true, + org.eclipse.net4j.internal.util.om;version="2.0.0";x-internal:=true, + org.eclipse.net4j.internal.util.om.monitor;version="2.0.0";x-internal:=true, + org.eclipse.net4j.internal.util.om.pref;version="2.0.0";x-internal:=true, + org.eclipse.net4j.util;version="2.0.0", + org.eclipse.net4j.util.cache;version="2.0.0", + org.eclipse.net4j.util.collection;version="2.0.0", + org.eclipse.net4j.util.concurrent;version="2.0.0", + org.eclipse.net4j.util.container;version="2.0.0", + org.eclipse.net4j.util.container.delegate;version="2.0.0", + org.eclipse.net4j.util.event;version="2.0.0", + org.eclipse.net4j.util.factory;version="2.0.0", + org.eclipse.net4j.util.fsm;version="2.0.0", + org.eclipse.net4j.util.io;version="2.0.0", + org.eclipse.net4j.util.lifecycle;version="2.0.0", + org.eclipse.net4j.util.om;version="2.0.0", + org.eclipse.net4j.util.om.log;version="2.0.0", + org.eclipse.net4j.util.om.monitor;version="2.0.0", + org.eclipse.net4j.util.om.pref;version="2.0.0", + org.eclipse.net4j.util.om.trace;version="2.0.0", + org.eclipse.net4j.util.ref;version="2.0.0", + org.eclipse.net4j.util.registry;version="2.0.0", + org.eclipse.net4j.util.security;version="2.0.0", + org.eclipse.net4j.util.transaction;version="2.0.0" diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOAdapter.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedIOAdapter.java index c490433c2d..011b62674e 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOAdapter.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedIOAdapter.java @@ -14,10 +14,11 @@ import java.io.IOException; /** * @author Eike Stepper + * @since 2.0 */ -public class IOAdapter implements IOHandler +public class ExtendedIOAdapter implements ExtendedIOHandler { - public IOAdapter() + public ExtendedIOAdapter() { } diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedIOHandler.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedIOHandler.java new file mode 100644 index 0000000000..2451a14801 --- /dev/null +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedIOHandler.java @@ -0,0 +1,20 @@ +/*************************************************************************** + * Copyright (c) 2004 - 2008 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.util.io; + + +/** + * @author Eike Stepper + * @since 2.0 + */ +public interface ExtendedIOHandler extends ExtendedInputHandler, ExtendedOutputHandler +{ +} diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedInputHandler.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedInputHandler.java new file mode 100644 index 0000000000..601997a780 --- /dev/null +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedInputHandler.java @@ -0,0 +1,22 @@ +/*************************************************************************** + * Copyright (c) 2004 - 2008 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.util.io; + +import java.io.IOException; + +/** + * @author Eike Stepper + * @since 2.0 + */ +public interface ExtendedInputHandler +{ + public void handleIn(ExtendedDataInputStream in) throws IOException; +} diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOHandler.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedOutputHandler.java index d1ac851169..3c167b9a23 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOHandler.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedOutputHandler.java @@ -14,10 +14,9 @@ import java.io.IOException; /** * @author Eike Stepper + * @since 2.0 */ -public interface IOHandler +public interface ExtendedOutputHandler { - public void handleIn(ExtendedDataInputStream in) throws IOException; - public void handleOut(ExtendedDataOutputStream out) throws IOException; } diff --git a/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF index 2c658b35f1..b9a8659fa1 100644 --- a/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Bundle-Activator: org.eclipse.internal.net4j.bundle.OM$Activator Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ClassPath: . Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";resolution:=optional, - org.eclipse.net4j.util;bundle-version="[1.0.0,2.0.0)";visibility:=reexport + org.eclipse.net4j.util;bundle-version="[2.0.0,3.0.0)";visibility:=reexport Export-Package: org.eclipse.internal.net4j;version="2.0.0";x-internal:=true, org.eclipse.internal.net4j.acceptor;version="2.0.0"; x-friends:="org.eclipse.net4j.http.server, |