diff options
Diffstat (limited to 'plugins')
266 files changed, 1603 insertions, 848 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Category.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Category.java index c39f3f03d6..439e1fe7f4 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Category.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Category.java @@ -13,7 +13,6 @@ import org.eclipse.emf.common.util.EList; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>Category</b></em>'. * <!-- end-user-doc --> - * * <p> * The following features are supported: * <ul> diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Company.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Company.java index 8ec3591ccf..932831ce0d 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Company.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Company.java @@ -13,7 +13,6 @@ import org.eclipse.emf.common.util.EList; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>Company</b></em>'. * <!-- end-user-doc --> - * * <p> * The following features are supported: * <ul> diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Customer.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Customer.java index 4f6643ff01..287d4f6a29 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Customer.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Customer.java @@ -13,7 +13,6 @@ import org.eclipse.emf.common.util.EList; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>Customer</b></em>'. * <!-- end-user-doc --> - * * <p> * The following features are supported: * <ul> diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderDetail.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderDetail.java index 23e24cafc3..e2e69fe883 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderDetail.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderDetail.java @@ -11,7 +11,6 @@ import org.eclipse.emf.cdo.CDOObject; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>Order Detail</b></em>'. * <!-- end-user-doc --> - * * <p> * The following features are supported: * <ul> diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Product.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Product.java index befc7a09de..a24004bc6a 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Product.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Product.java @@ -13,7 +13,6 @@ import org.eclipse.emf.common.util.EList; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>Product</b></em>'. * <!-- end-user-doc --> - * * <p> * The following features are supported: * <ul> diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/PurchaseOrder.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/PurchaseOrder.java index 7e64b817a3..4955f5113a 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/PurchaseOrder.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/PurchaseOrder.java @@ -13,7 +13,6 @@ import java.util.Date; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>Purchase Order</b></em>'. * <!-- end-user-doc --> - * * <p> * The following features are supported: * <ul> diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/SalesOrder.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/SalesOrder.java index c6c8f478e6..610b57bb0a 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/SalesOrder.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/SalesOrder.java @@ -11,7 +11,6 @@ import org.eclipse.emf.cdo.CDOObject; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>Sales Order</b></em>'. * <!-- end-user-doc --> - * * <p> * The following features are supported: * <ul> diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Supplier.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Supplier.java index 4aa50bf8b8..167e085c32 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Supplier.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Supplier.java @@ -11,7 +11,6 @@ import org.eclipse.emf.cdo.CDOObject; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>Supplier</b></em>'. * <!-- end-user-doc --> - * * <p> * The following features are supported: * <ul> diff --git a/plugins/org.eclipse.emf.cdo.ui/CDO UI.launch b/plugins/org.eclipse.emf.cdo.ui/CDO UI.launch index 953f018540..8dc207154a 100644 --- a/plugins/org.eclipse.emf.cdo.ui/CDO UI.launch +++ b/plugins/org.eclipse.emf.cdo.ui/CDO UI.launch @@ -1,32 +1,28 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<?xml version="1.0" encoding="UTF-8"?> <launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench"> +<stringAttribute key="product" value="org.eclipse.sdk.ide"/> +<booleanAttribute key="usefeatures" value="false"/> <stringAttribute key="bootstrap" value=""/> +<booleanAttribute key="useProduct" value="true"/> +<booleanAttribute key="tracing" value="true"/> +<stringAttribute key="selected_target_plugins" value="com.ibm.icu,com.ibm.icu.source,com.jcraft.jsch,javax.servlet,javax.servlet.jsp,org.apache.ant,org.apache.commons.el,org.apache.commons.logging,org.apache.jasper,org.apache.lucene,org.apache.lucene.analysis,org.eclipse.ant.core,org.eclipse.ant.ui,org.eclipse.compare,org.eclipse.core.boot,org.eclipse.core.commands,org.eclipse.core.contenttype,org.eclipse.core.databinding,org.eclipse.core.databinding.beans,org.eclipse.core.expressions,org.eclipse.core.filebuffers,org.eclipse.core.filesystem,org.eclipse.core.filesystem.win32.x86,org.eclipse.core.jobs,org.eclipse.core.net,org.eclipse.core.resources,org.eclipse.core.resources.compatibility,org.eclipse.core.resources.win32,org.eclipse.core.runtime,org.eclipse.core.runtime.compatibility,org.eclipse.core.runtime.compatibility.auth,org.eclipse.core.runtime.compatibility.registry,org.eclipse.core.variables,org.eclipse.cvs,org.eclipse.cvs.source,org.eclipse.debug.core,org.eclipse.debug.ui,org.eclipse.emf,org.eclipse.emf.ant,org.eclipse.emf.cheatsheets,org.eclipse.emf.codegen,org.eclipse.emf.codegen.ecore,org.eclipse.emf.codegen.ecore.ui,org.eclipse.emf.codegen.ui,org.eclipse.emf.common,org.eclipse.emf.common.ui,org.eclipse.emf.commonj.sdo,org.eclipse.emf.converter,org.eclipse.emf.doc,org.eclipse.emf.ecore,org.eclipse.emf.ecore.change,org.eclipse.emf.ecore.change.edit,org.eclipse.emf.ecore.edit,org.eclipse.emf.ecore.editor,org.eclipse.emf.ecore.sdo,org.eclipse.emf.ecore.sdo.doc,org.eclipse.emf.ecore.sdo.edit,org.eclipse.emf.ecore.sdo.editor,org.eclipse.emf.ecore.sdo.source,org.eclipse.emf.ecore.xmi,org.eclipse.emf.edit,org.eclipse.emf.edit.ui,org.eclipse.emf.exporter,org.eclipse.emf.importer,org.eclipse.emf.importer.ecore,org.eclipse.emf.importer.java,org.eclipse.emf.importer.rose,org.eclipse.emf.mapping,org.eclipse.emf.mapping.ecore2ecore,org.eclipse.emf.mapping.ecore2ecore.editor,org.eclipse.emf.mapping.ecore2xml,org.eclipse.emf.mapping.ecore2xml.ui,org.eclipse.emf.mapping.ui,org.eclipse.emf.mapping.xsd2ecore,org.eclipse.emf.mapping.xsd2ecore.editor,org.eclipse.emf.source,org.eclipse.equinox.app,org.eclipse.equinox.common,org.eclipse.equinox.http.jetty,org.eclipse.equinox.http.servlet,org.eclipse.equinox.jsp.jasper,org.eclipse.equinox.jsp.jasper.registry,org.eclipse.equinox.launcher,org.eclipse.equinox.launcher.win32.win32.x86,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.help,org.eclipse.help.appserver,org.eclipse.help.base,org.eclipse.help.ui,org.eclipse.help.webapp,org.eclipse.jdt,org.eclipse.jdt.apt.core,org.eclipse.jdt.apt.ui,org.eclipse.jdt.core,org.eclipse.jdt.core.manipulation,org.eclipse.jdt.debug,org.eclipse.jdt.debug.ui,org.eclipse.jdt.doc.isv,org.eclipse.jdt.doc.user,org.eclipse.jdt.junit,org.eclipse.jdt.junit.runtime,org.eclipse.jdt.junit4.runtime,org.eclipse.jdt.launching,org.eclipse.jdt.source,org.eclipse.jdt.ui,org.eclipse.jface,org.eclipse.jface.databinding,org.eclipse.jface.text,org.eclipse.jsch.core,org.eclipse.ltk.core.refactoring,org.eclipse.ltk.ui.refactoring,org.eclipse.osgi,org.eclipse.osgi.services,org.eclipse.osgi.util,org.eclipse.pde,org.eclipse.pde.build,org.eclipse.pde.core,org.eclipse.pde.doc.user,org.eclipse.pde.junit.runtime,org.eclipse.pde.runtime,org.eclipse.pde.source,org.eclipse.pde.ui,org.eclipse.pde.ui.templates,org.eclipse.platform,org.eclipse.platform.doc.isv,org.eclipse.platform.source,org.eclipse.platform.source.win32.win32.x86,org.eclipse.rcp,org.eclipse.rcp.source,org.eclipse.rcp.source.win32.win32.x86,org.eclipse.sdk,org.eclipse.search,org.eclipse.swt,org.eclipse.swt.win32.win32.x86,org.eclipse.team.core,org.eclipse.team.cvs.core,org.eclipse.team.cvs.ssh,org.eclipse.team.cvs.ssh2,org.eclipse.team.cvs.ui,org.eclipse.team.ui,org.eclipse.text,org.eclipse.tomcat,org.eclipse.ui,org.eclipse.ui.browser,org.eclipse.ui.cheatsheets,org.eclipse.ui.console,org.eclipse.ui.editors,org.eclipse.ui.externaltools,org.eclipse.ui.forms,org.eclipse.ui.ide,org.eclipse.ui.ide.application,org.eclipse.ui.intro,org.eclipse.ui.intro.universal,org.eclipse.ui.navigator,org.eclipse.ui.navigator.resources,org.eclipse.ui.presentations.r21,org.eclipse.ui.views,org.eclipse.ui.views.properties.tabbed,org.eclipse.ui.win32,org.eclipse.ui.workbench,org.eclipse.ui.workbench.compatibility,org.eclipse.ui.workbench.texteditor,org.eclipse.update.configurator,org.eclipse.update.core,org.eclipse.update.core.win32,org.eclipse.update.scheduler,org.eclipse.update.ui,org.eclipse.xsd,org.eclipse.xsd.cheatsheets,org.eclipse.xsd.doc,org.eclipse.xsd.ecore.exporter,org.eclipse.xsd.ecore.importer,org.eclipse.xsd.edit,org.eclipse.xsd.editor,org.eclipse.xsd.source,org.junit,org.junit4,org.mortbay.jetty"/> +<booleanAttribute key="automaticValidate" value="true"/> <stringAttribute key="selectedPlugin" value="org.eclipse.emf.cdo.ui"/> +<booleanAttribute key="automaticAdd" value="false"/> +<stringAttribute key="checked" value="org.eclipse.emf.cdo,org.eclipse.emf.cdo.protocol,org.eclipse.emf.cdo.server,org.eclipse.emf.cdo.ui,org.eclipse.net4j,org.eclipse.net4j.jvm,org.eclipse.net4j.tcp,org.eclipse.net4j.ui"/> +<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.server,org.eclipse.emf.cdo.protocol,org.eclipse.emf.cdo.tests.model1.editor,org.eclipse.emf.cdo.tests.model1.edit,org.eclipse.emf.cdo.ui,org.eclipse.emf.cdo.tests.model1,org.eclipse.net4j,org.eclipse.net4j.tcp,org.eclipse.net4j.ui,org.eclipse.emf.cdo"/> <stringAttribute key="location" value="${workspace_loc}/../cdo.ui"/> <stringAttribute key="configLocation" value=""/> +<booleanAttribute key="clearws" value="false"/> +<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-nosplash"/> +<stringAttribute key="pde.version" value="3.3"/> <stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/> +<booleanAttribute key="default" value="false"/> +<booleanAttribute key="clearConfig" value="false"/> <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/> -<booleanAttribute key="tracing" value="true"/> -<stringAttribute key="pde.version" value="3.3"/> -<listAttribute key="org.eclipse.debug.ui.favoriteGroups"> -<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/> -<listEntry value="org.eclipse.debug.ui.launchGroup.run"/> -</listAttribute> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> -<booleanAttribute key="usefeatures" value="false"/> -<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-nosplash"/> +<booleanAttribute key="useDefaultConfigArea" value="true"/> <booleanAttribute key="useDefaultConfig" value="true"/> -<booleanAttribute key="clearws" value="false"/> -<stringAttribute key="selected_target_plugins" value="com.ibm.icu,com.ibm.icu.source,com.jcraft.jsch,javax.servlet,javax.servlet.jsp,org.apache.ant,org.apache.commons.el,org.apache.commons.logging,org.apache.jasper,org.apache.lucene,org.apache.lucene.analysis,org.eclipse.ant.core,org.eclipse.ant.ui,org.eclipse.compare,org.eclipse.core.boot,org.eclipse.core.commands,org.eclipse.core.contenttype,org.eclipse.core.databinding,org.eclipse.core.databinding.beans,org.eclipse.core.expressions,org.eclipse.core.filebuffers,org.eclipse.core.filesystem,org.eclipse.core.filesystem.win32.x86,org.eclipse.core.jobs,org.eclipse.core.net,org.eclipse.core.resources,org.eclipse.core.resources.compatibility,org.eclipse.core.resources.win32,org.eclipse.core.runtime,org.eclipse.core.runtime.compatibility,org.eclipse.core.runtime.compatibility.auth,org.eclipse.core.runtime.compatibility.registry,org.eclipse.core.variables,org.eclipse.cvs,org.eclipse.cvs.source,org.eclipse.debug.core,org.eclipse.debug.ui,org.eclipse.emf,org.eclipse.emf.ant,org.eclipse.emf.cheatsheets,org.eclipse.emf.codegen,org.eclipse.emf.codegen.ecore,org.eclipse.emf.codegen.ecore.ui,org.eclipse.emf.codegen.ui,org.eclipse.emf.common,org.eclipse.emf.common.ui,org.eclipse.emf.commonj.sdo,org.eclipse.emf.converter,org.eclipse.emf.doc,org.eclipse.emf.ecore,org.eclipse.emf.ecore.change,org.eclipse.emf.ecore.change.edit,org.eclipse.emf.ecore.edit,org.eclipse.emf.ecore.editor,org.eclipse.emf.ecore.sdo,org.eclipse.emf.ecore.sdo.doc,org.eclipse.emf.ecore.sdo.edit,org.eclipse.emf.ecore.sdo.editor,org.eclipse.emf.ecore.sdo.source,org.eclipse.emf.ecore.xmi,org.eclipse.emf.edit,org.eclipse.emf.edit.ui,org.eclipse.emf.exporter,org.eclipse.emf.importer,org.eclipse.emf.importer.ecore,org.eclipse.emf.importer.java,org.eclipse.emf.importer.rose,org.eclipse.emf.mapping,org.eclipse.emf.mapping.ecore2ecore,org.eclipse.emf.mapping.ecore2ecore.editor,org.eclipse.emf.mapping.ecore2xml,org.eclipse.emf.mapping.ecore2xml.ui,org.eclipse.emf.mapping.ui,org.eclipse.emf.mapping.xsd2ecore,org.eclipse.emf.mapping.xsd2ecore.editor,org.eclipse.emf.source,org.eclipse.equinox.app,org.eclipse.equinox.common,org.eclipse.equinox.http.jetty,org.eclipse.equinox.http.servlet,org.eclipse.equinox.jsp.jasper,org.eclipse.equinox.jsp.jasper.registry,org.eclipse.equinox.launcher,org.eclipse.equinox.launcher.win32.win32.x86,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.help,org.eclipse.help.appserver,org.eclipse.help.base,org.eclipse.help.ui,org.eclipse.help.webapp,org.eclipse.jdt,org.eclipse.jdt.apt.core,org.eclipse.jdt.apt.ui,org.eclipse.jdt.core,org.eclipse.jdt.core.manipulation,org.eclipse.jdt.debug,org.eclipse.jdt.debug.ui,org.eclipse.jdt.doc.isv,org.eclipse.jdt.doc.user,org.eclipse.jdt.junit,org.eclipse.jdt.junit.runtime,org.eclipse.jdt.junit4.runtime,org.eclipse.jdt.launching,org.eclipse.jdt.source,org.eclipse.jdt.ui,org.eclipse.jface,org.eclipse.jface.databinding,org.eclipse.jface.text,org.eclipse.jsch.core,org.eclipse.ltk.core.refactoring,org.eclipse.ltk.ui.refactoring,org.eclipse.osgi,org.eclipse.osgi.services,org.eclipse.osgi.util,org.eclipse.pde,org.eclipse.pde.build,org.eclipse.pde.core,org.eclipse.pde.doc.user,org.eclipse.pde.junit.runtime,org.eclipse.pde.runtime,org.eclipse.pde.source,org.eclipse.pde.ui,org.eclipse.pde.ui.templates,org.eclipse.platform,org.eclipse.platform.doc.isv,org.eclipse.platform.source,org.eclipse.platform.source.win32.win32.x86,org.eclipse.rcp,org.eclipse.rcp.source,org.eclipse.rcp.source.win32.win32.x86,org.eclipse.sdk,org.eclipse.search,org.eclipse.swt,org.eclipse.swt.win32.win32.x86,org.eclipse.team.core,org.eclipse.team.cvs.core,org.eclipse.team.cvs.ssh,org.eclipse.team.cvs.ssh2,org.eclipse.team.cvs.ui,org.eclipse.team.ui,org.eclipse.text,org.eclipse.tomcat,org.eclipse.ui,org.eclipse.ui.browser,org.eclipse.ui.cheatsheets,org.eclipse.ui.console,org.eclipse.ui.editors,org.eclipse.ui.externaltools,org.eclipse.ui.forms,org.eclipse.ui.ide,org.eclipse.ui.ide.application,org.eclipse.ui.intro,org.eclipse.ui.intro.universal,org.eclipse.ui.navigator,org.eclipse.ui.navigator.resources,org.eclipse.ui.presentations.r21,org.eclipse.ui.views,org.eclipse.ui.views.properties.tabbed,org.eclipse.ui.win32,org.eclipse.ui.workbench,org.eclipse.ui.workbench.compatibility,org.eclipse.ui.workbench.texteditor,org.eclipse.update.configurator,org.eclipse.update.core,org.eclipse.update.core.win32,org.eclipse.update.scheduler,org.eclipse.update.ui,org.eclipse.xsd,org.eclipse.xsd.cheatsheets,org.eclipse.xsd.doc,org.eclipse.xsd.ecore.exporter,org.eclipse.xsd.ecore.importer,org.eclipse.xsd.edit,org.eclipse.xsd.editor,org.eclipse.xsd.source,org.junit,org.junit4,org.mortbay.jetty"/> -<booleanAttribute key="automaticValidate" value="true"/> <booleanAttribute key="askclear" value="true"/> -<stringAttribute key="product" value="org.eclipse.sdk.ide"/> <booleanAttribute key="includeOptional" value="true"/> -<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.server,org.eclipse.emf.cdo.protocol,org.eclipse.emf.cdo.tests.model1.editor,org.eclipse.emf.cdo.tests.model1.edit,org.eclipse.emf.cdo.ui,org.eclipse.emf.cdo.tests.model1,org.eclipse.net4j,org.eclipse.net4j.tcp,org.eclipse.net4j.ui,org.eclipse.emf.cdo"/> -<booleanAttribute key="useProduct" value="true"/> -<booleanAttribute key="default" value="false"/> -<booleanAttribute key="clearConfig" value="false"/> -<stringAttribute key="checked" value="org.eclipse.emf.cdo,org.eclipse.emf.cdo.protocol,org.eclipse.emf.cdo.server,org.eclipse.emf.cdo.ui,org.eclipse.net4j,org.eclipse.net4j.jvm,org.eclipse.net4j.tcp,org.eclipse.net4j.ui"/> -<booleanAttribute key="useDefaultConfigArea" value="true"/> -<booleanAttribute key="automaticAdd" value="false"/> </launchConfiguration> 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 6196cc1135..ab88b50a1f 100644 --- a/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF @@ -8,13 +8,14 @@ Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.resources, org.eclipse.ui.ide;visibility:=reexport, + org.eclipse.net4j;visibility:=reexport, org.eclipse.net4j.ui;visibility:=reexport, org.eclipse.emf.edit.ui;visibility:=reexport, org.eclipse.emf.ecore.edit;visibility:=reexport, org.eclipse.emf.cdo;visibility:=reexport -Eclipse-LazyStart: true Export-Package: org.eclipse.emf.cdo.internal.ui.bundle;version="0.8.0", org.eclipse.emf.cdo.internal.ui.editor;version="0.8.0", org.eclipse.emf.cdo.internal.ui.views;version="0.8.0", org.eclipse.emf.cdo.internal.ui.wizards;version="0.8.0", org.eclipse.emf.cdo.internal.ui.wizards.steps;version="0.8.0" +Eclipse-LazyStart: true diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/CDOUI.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/CDOUI.java index 776bcf6317..3668152b4d 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/CDOUI.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/CDOUI.java @@ -10,13 +10,12 @@ **************************************************************************/ package org.eclipse.emf.cdo.internal.ui.bundle; +import org.eclipse.net4j.internal.util.om.OSGiActivator; import org.eclipse.net4j.util.om.OMBundle; import org.eclipse.net4j.util.om.OMLogger; import org.eclipse.net4j.util.om.OMPlatform; import org.eclipse.net4j.util.om.OMTracer; -import org.eclipse.internal.net4j.util.om.OSGiActivator; - /** * @author Eike Stepper */ 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 2e1dbd290f..6ddda6865c 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 @@ -3,8 +3,8 @@ package org.eclipse.emf.cdo.internal.ui.views; import org.eclipse.emf.cdo.CDOSession; import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; -import org.eclipse.net4j.transport.IPluginTransportContainer; -import org.eclipse.net4j.transport.ITransportContainer; +import org.eclipse.net4j.IPluginTransportContainer; +import org.eclipse.net4j.ITransportContainer; import org.eclipse.net4j.ui.actions.SafeAction; import org.eclipse.net4j.ui.views.ContainerItemProvider; import org.eclipse.net4j.ui.views.ContainerView; diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/wizards/NewSessionWizard.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/wizards/NewSessionWizard.java index 58bb48d38f..d481b3a9aa 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/wizards/NewSessionWizard.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/wizards/NewSessionWizard.java @@ -13,11 +13,11 @@ package org.eclipse.emf.cdo.internal.ui.wizards; import org.eclipse.emf.cdo.internal.ui.wizards.steps.RepoNameStep; import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; +import org.eclipse.net4j.IConnector; +import org.eclipse.net4j.IPluginTransportContainer; +import org.eclipse.net4j.ITransportContainer; import org.eclipse.net4j.internal.ui.wizards.steps.ProvideConnectorStep; import org.eclipse.net4j.internal.ui.wizards.steps.SelectConnectorStep; -import org.eclipse.net4j.transport.IConnector; -import org.eclipse.net4j.transport.IPluginTransportContainer; -import org.eclipse.net4j.transport.ITransportContainer; import org.eclipse.net4j.ui.wizards.ParallelStep; import org.eclipse.net4j.ui.wizards.Step; import org.eclipse.net4j.ui.wizards.SteppingNewWizard; 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 d0b7ee517a..b58011e359 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,11 @@ package org.eclipse.net4j.internal.debug; import org.eclipse.net4j.internal.debug.views.RemoteTraceView; +import org.eclipse.net4j.internal.util.lifecycle.Lifecycle; 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.Lifecycle; - import java.util.ArrayList; import java.util.List; diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMAcceptor.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMAcceptor.java index 0eb804a014..4f2d5f72fd 100644 --- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMAcceptor.java +++ b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMAcceptor.java @@ -13,7 +13,7 @@ package org.eclipse.net4j.internal.jvm; import org.eclipse.net4j.jvm.IJVMAcceptor; import org.eclipse.net4j.util.StringUtil; -import org.eclipse.internal.net4j.transport.Acceptor; +import org.eclipse.internal.net4j.Acceptor; import java.text.MessageFormat; diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMAcceptorFactory.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMAcceptorFactory.java index 0a0310f9c3..567cde2d40 100644 --- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMAcceptorFactory.java +++ b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMAcceptorFactory.java @@ -13,7 +13,7 @@ package org.eclipse.net4j.internal.jvm; import org.eclipse.net4j.jvm.IJVMConstants; import org.eclipse.net4j.util.factory.ProductCreationException; -import org.eclipse.internal.net4j.transport.AcceptorFactory; +import org.eclipse.internal.net4j.AcceptorFactory; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMAcceptorManager.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMAcceptorManager.java index c092d12975..4900822049 100644 --- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMAcceptorManager.java +++ b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMAcceptorManager.java @@ -10,12 +10,11 @@ **************************************************************************/ package org.eclipse.net4j.internal.jvm; +import org.eclipse.net4j.internal.util.registry.HashMapRegistry; import org.eclipse.net4j.jvm.IJVMAcceptor; import org.eclipse.net4j.jvm.IJVMAcceptorManager; import org.eclipse.net4j.util.registry.IRegistry; -import org.eclipse.internal.net4j.util.registry.HashMapRegistry; - /** * @author Eike Stepper */ diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMClientConnector.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMClientConnector.java index 4799e9c419..a735c291bf 100644 --- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMClientConnector.java +++ b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMClientConnector.java @@ -10,13 +10,12 @@ **************************************************************************/ package org.eclipse.net4j.internal.jvm; -import org.eclipse.net4j.transport.ConnectorLocation; +import org.eclipse.net4j.ConnectorLocation; +import org.eclipse.net4j.internal.util.lifecycle.LifecycleEventAdapter; import org.eclipse.net4j.util.event.IListener; import org.eclipse.net4j.util.lifecycle.ILifecycle; import org.eclipse.net4j.util.lifecycle.LifecycleUtil; -import org.eclipse.internal.net4j.util.lifecycle.LifecycleEventAdapter; - /** * @author Eike Stepper */ diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMConnector.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMConnector.java index c772734133..4142d6dcb0 100644 --- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMConnector.java +++ b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMConnector.java @@ -10,13 +10,13 @@ **************************************************************************/ package org.eclipse.net4j.internal.jvm; -import org.eclipse.net4j.transport.ConnectorException; -import org.eclipse.net4j.transport.IBuffer; -import org.eclipse.net4j.transport.IChannel; -import org.eclipse.net4j.transport.IProtocol; +import org.eclipse.net4j.ConnectorException; +import org.eclipse.net4j.IBuffer; +import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.IProtocol; -import org.eclipse.internal.net4j.transport.Channel; -import org.eclipse.internal.net4j.transport.Connector; +import org.eclipse.internal.net4j.Channel; +import org.eclipse.internal.net4j.Connector; import java.util.Queue; diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMConnectorFactory.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMConnectorFactory.java index f7b99a331c..c2b8cb7456 100644 --- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMConnectorFactory.java +++ b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMConnectorFactory.java @@ -13,7 +13,7 @@ package org.eclipse.net4j.internal.jvm; import org.eclipse.net4j.jvm.IJVMConstants; import org.eclipse.net4j.util.factory.ProductCreationException; -import org.eclipse.internal.net4j.transport.ConnectorFactory; +import org.eclipse.internal.net4j.ConnectorFactory; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMServerConnector.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMServerConnector.java index 2340767ef2..360218c732 100644 --- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMServerConnector.java +++ b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMServerConnector.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.internal.jvm; -import org.eclipse.net4j.transport.ConnectorLocation; +import org.eclipse.net4j.ConnectorLocation; import org.eclipse.net4j.util.lifecycle.LifecycleUtil; /** diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/bundle/JVM.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/bundle/JVM.java index 3e03a17411..f82e1852c4 100644 --- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/bundle/JVM.java +++ b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/bundle/JVM.java @@ -10,13 +10,12 @@ **************************************************************************/ package org.eclipse.net4j.internal.jvm.bundle; +import org.eclipse.net4j.internal.util.om.OSGiActivator; import org.eclipse.net4j.util.om.OMBundle; import org.eclipse.net4j.util.om.OMLogger; import org.eclipse.net4j.util.om.OMPlatform; import org.eclipse.net4j.util.om.OMTracer; -import org.eclipse.internal.net4j.util.om.OSGiActivator; - /** * @author Eike Stepper */ diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMAcceptor.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMAcceptor.java index cbecd6ba89..5f6483466d 100644 --- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMAcceptor.java +++ b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMAcceptor.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.jvm; -import org.eclipse.net4j.transport.IAcceptor; +import org.eclipse.net4j.IAcceptor; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMConnector.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMConnector.java index cfa2cbc40d..8a516e7997 100644 --- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMConnector.java +++ b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMConnector.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.jvm; -import org.eclipse.net4j.transport.IConnector; +import org.eclipse.net4j.IConnector; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ControlChannel.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ControlChannel.java index 9d6557a40d..4107dc59f4 100644 --- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ControlChannel.java +++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ControlChannel.java @@ -10,15 +10,15 @@ **************************************************************************/ package org.eclipse.net4j.internal.tcp; -import org.eclipse.net4j.transport.IBuffer; -import org.eclipse.net4j.transport.IProtocol; +import org.eclipse.net4j.IBuffer; +import org.eclipse.net4j.IProtocol; +import org.eclipse.net4j.internal.util.concurrent.SynchronizingCorrelator; import org.eclipse.net4j.util.concurrent.ISynchronizer; import org.eclipse.net4j.util.om.trace.ContextTracer; -import org.eclipse.internal.net4j.bundle.Net4j; -import org.eclipse.internal.net4j.transport.BufferUtil; -import org.eclipse.internal.net4j.transport.Channel; -import org.eclipse.internal.net4j.util.concurrent.SynchronizingCorrelator; +import org.eclipse.internal.net4j.BufferUtil; +import org.eclipse.internal.net4j.Channel; +import org.eclipse.internal.net4j.bundle.OM; import java.nio.ByteBuffer; @@ -41,7 +41,7 @@ public final class ControlChannel extends Channel public static final byte FAILURE = 0; - private static final ContextTracer TRACER = new ContextTracer(Net4j.DEBUG_CHANNEL, ControlChannel.class); + private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_CHANNEL, ControlChannel.class); private SynchronizingCorrelator<Short, Boolean> registrations = new SynchronizingCorrelator(); @@ -125,7 +125,7 @@ public final class ControlChannel extends Channel } catch (Exception ex) { - Net4j.LOG.error(ex); + OM.LOG.error(ex); success = false; } @@ -156,7 +156,7 @@ public final class ControlChannel extends Channel } catch (Exception ex) { - Net4j.LOG.error(ex); + OM.LOG.error(ex); } } @@ -164,7 +164,7 @@ public final class ControlChannel extends Channel } default: - Net4j.LOG.error("Invalid opcode: " + opcode); //$NON-NLS-1$ + OM.LOG.error("Invalid opcode: " + opcode); //$NON-NLS-1$ ((TCPConnector)getConnector()).deactivate(); } } diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/SelectorUtil.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/SelectorUtil.java index 426c9442ad..936020928e 100644 --- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/SelectorUtil.java +++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/SelectorUtil.java @@ -12,7 +12,7 @@ package org.eclipse.net4j.internal.tcp; import org.eclipse.net4j.util.om.trace.ContextTracer; -import org.eclipse.internal.net4j.bundle.Net4j; +import org.eclipse.internal.net4j.bundle.OM; import java.nio.channels.SelectionKey; @@ -21,7 +21,7 @@ import java.nio.channels.SelectionKey; */ public final class SelectorUtil { - private static final ContextTracer TRACER = new ContextTracer(Net4j.DEBUG_SELECTOR, SelectorUtil.class); + private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_SELECTOR, SelectorUtil.class); private SelectorUtil() { diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPAcceptor.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPAcceptor.java index 96d2e268ed..abb86fb98d 100644 --- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPAcceptor.java +++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPAcceptor.java @@ -16,8 +16,8 @@ import org.eclipse.net4j.tcp.ITCPSelectorListener; import org.eclipse.net4j.util.StringUtil; import org.eclipse.net4j.util.om.trace.ContextTracer; -import org.eclipse.internal.net4j.bundle.Net4j; -import org.eclipse.internal.net4j.transport.Acceptor; +import org.eclipse.internal.net4j.Acceptor; +import org.eclipse.internal.net4j.bundle.OM; import java.net.InetAddress; import java.net.InetSocketAddress; @@ -34,7 +34,7 @@ import java.util.concurrent.CountDownLatch; */ public class TCPAcceptor extends Acceptor implements ITCPAcceptor, ITCPSelectorListener.Passive { - private static final ContextTracer TRACER = new ContextTracer(Net4j.DEBUG_ACCEPTOR, TCPAcceptor.class); + private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_ACCEPTOR, TCPAcceptor.class); private TCPSelector selector; @@ -133,7 +133,7 @@ public class TCPAcceptor extends Acceptor implements ITCPAcceptor, ITCPSelectorL { if (isActive()) { - Net4j.LOG.error(ex); + OM.LOG.error(ex); } deactivate(); diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPAcceptorFactory.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPAcceptorFactory.java index c33dc64019..f54f21cc7d 100644 --- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPAcceptorFactory.java +++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPAcceptorFactory.java @@ -13,7 +13,7 @@ package org.eclipse.net4j.internal.tcp; import org.eclipse.net4j.tcp.ITCPConstants; import org.eclipse.net4j.util.StringUtil; -import org.eclipse.internal.net4j.transport.AcceptorFactory; +import org.eclipse.internal.net4j.AcceptorFactory; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPClientConnector.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPClientConnector.java index ffcea5a932..2d27a5f852 100644 --- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPClientConnector.java +++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPClientConnector.java @@ -10,9 +10,9 @@ **************************************************************************/ package org.eclipse.net4j.internal.tcp; -import org.eclipse.net4j.transport.ConnectorLocation; +import org.eclipse.net4j.ConnectorLocation; -import org.eclipse.internal.net4j.bundle.Net4j; +import org.eclipse.internal.net4j.bundle.OM; import java.io.IOException; import java.net.InetAddress; @@ -35,7 +35,7 @@ public class TCPClientConnector extends TCPConnector } catch (IOException ex) { - Net4j.LOG.error(ex); + OM.LOG.error(ex); } } diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnector.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnector.java index ac885cca48..363a6c5080 100644 --- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnector.java +++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnector.java @@ -10,19 +10,19 @@ **************************************************************************/ package org.eclipse.net4j.internal.tcp; +import org.eclipse.net4j.ConnectorException; +import org.eclipse.net4j.ConnectorState; +import org.eclipse.net4j.IBuffer; +import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.IProtocol; import org.eclipse.net4j.tcp.ITCPConnector; import org.eclipse.net4j.tcp.ITCPSelector; import org.eclipse.net4j.tcp.ITCPSelectorListener; -import org.eclipse.net4j.transport.ConnectorException; -import org.eclipse.net4j.transport.ConnectorState; -import org.eclipse.net4j.transport.IBuffer; -import org.eclipse.net4j.transport.IChannel; -import org.eclipse.net4j.transport.IProtocol; import org.eclipse.net4j.util.om.trace.ContextTracer; -import org.eclipse.internal.net4j.bundle.Net4j; -import org.eclipse.internal.net4j.transport.Channel; -import org.eclipse.internal.net4j.transport.Connector; +import org.eclipse.internal.net4j.Channel; +import org.eclipse.internal.net4j.Connector; +import org.eclipse.internal.net4j.bundle.OM; import java.nio.ByteBuffer; import java.nio.channels.ClosedChannelException; @@ -36,7 +36,7 @@ import java.util.Queue; */ public abstract class TCPConnector extends Connector implements ITCPConnector, ITCPSelectorListener.Active { - private static final ContextTracer TRACER = new ContextTracer(Net4j.DEBUG_CONNECTOR, TCPConnector.class); + private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_CONNECTOR, TCPConnector.class); private SocketChannel socketChannel; @@ -141,7 +141,7 @@ public abstract class TCPConnector extends Connector implements ITCPConnector, I } catch (Exception ex) { - Net4j.LOG.error(ex); + OM.LOG.error(ex); deactivate(); } } @@ -183,7 +183,7 @@ public abstract class TCPConnector extends Connector implements ITCPConnector, I } catch (Exception ex) { - Net4j.LOG.error(ex); + OM.LOG.error(ex); deactivate(); } } @@ -232,7 +232,7 @@ public abstract class TCPConnector extends Connector implements ITCPConnector, I } catch (Exception ex) { - Net4j.LOG.error(ex); + OM.LOG.error(ex); deactivate(); } } diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnectorFactory.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnectorFactory.java index 00cb64d089..82deca328e 100644 --- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnectorFactory.java +++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnectorFactory.java @@ -14,7 +14,7 @@ import org.eclipse.net4j.tcp.ITCPConstants; import org.eclipse.net4j.util.StringUtil; import org.eclipse.net4j.util.factory.ProductCreationException; -import org.eclipse.internal.net4j.transport.ConnectorFactory; +import org.eclipse.internal.net4j.ConnectorFactory; import java.net.MalformedURLException; import java.net.URL; diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelector.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelector.java index 6821db9051..e337a51cdf 100644 --- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelector.java +++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelector.java @@ -10,14 +10,14 @@ **************************************************************************/ package org.eclipse.net4j.internal.tcp; +import org.eclipse.net4j.internal.util.lifecycle.Lifecycle; import org.eclipse.net4j.tcp.ITCPSelector; import org.eclipse.net4j.tcp.ITCPSelectorListener; import org.eclipse.net4j.tcp.ITCPSelectorListener.Active; import org.eclipse.net4j.tcp.ITCPSelectorListener.Passive; import org.eclipse.net4j.util.om.trace.ContextTracer; -import org.eclipse.internal.net4j.bundle.Net4j; -import org.eclipse.internal.net4j.util.lifecycle.Lifecycle; +import org.eclipse.internal.net4j.bundle.OM; import java.io.IOException; import java.nio.channels.CancelledKeyException; @@ -37,7 +37,7 @@ import java.util.concurrent.ConcurrentLinkedQueue; */ public class TCPSelector extends Lifecycle implements ITCPSelector, Runnable { - private static final ContextTracer TRACER = new ContextTracer(Net4j.DEBUG_SELECTOR, TCPSelector.class); + private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_SELECTOR, TCPSelector.class); private Selector selector; @@ -193,7 +193,7 @@ public class TCPSelector extends Lifecycle implements ITCPSelector, Runnable } catch (Exception ex) { - Net4j.LOG.error(ex); + OM.LOG.error(ex); selKey.cancel(); } } @@ -205,7 +205,7 @@ public class TCPSelector extends Lifecycle implements ITCPSelector, Runnable } catch (Exception ex) { - Net4j.LOG.error(ex); + OM.LOG.error(ex); deactivate(); break; } diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelectorFactory.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelectorFactory.java index da2f46a55e..fbc67d6ac3 100644 --- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelectorFactory.java +++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelectorFactory.java @@ -10,17 +10,17 @@ **************************************************************************/ package org.eclipse.net4j.internal.tcp; +import org.eclipse.net4j.internal.util.factory.Factory; import org.eclipse.net4j.tcp.ITCPConstants; -import org.eclipse.internal.net4j.bundle.Net4j; -import org.eclipse.internal.net4j.util.factory.Factory; +import org.eclipse.internal.net4j.bundle.OM; /** * @author Eike Stepper */ public class TCPSelectorFactory extends Factory<TCPSelector> { - public static final String SELECTOR_GROUP = Net4j.BUNDLE_ID + ".selectors"; + public static final String SELECTOR_GROUP = OM.BUNDLE_ID + ".selectors"; public TCPSelectorFactory() { diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPServerConnector.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPServerConnector.java index 5c05eecc11..35b0a92d08 100644 --- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPServerConnector.java +++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPServerConnector.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.internal.tcp; -import org.eclipse.net4j.transport.ConnectorLocation; +import org.eclipse.net4j.ConnectorLocation; import java.text.MessageFormat; diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/bundle/TCP.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/bundle/TCP.java index 183ee009e5..ce0b008f22 100644 --- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/bundle/TCP.java +++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/bundle/TCP.java @@ -10,13 +10,12 @@ **************************************************************************/ package org.eclipse.net4j.internal.tcp.bundle; +import org.eclipse.net4j.internal.util.om.OSGiActivator; import org.eclipse.net4j.util.om.OMBundle; import org.eclipse.net4j.util.om.OMLogger; import org.eclipse.net4j.util.om.OMPlatform; import org.eclipse.net4j.util.om.OMTracer; -import org.eclipse.internal.net4j.util.om.OSGiActivator; - /** * @author Eike Stepper */ diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPAcceptor.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPAcceptor.java index 820a6424b5..f360788601 100644 --- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPAcceptor.java +++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPAcceptor.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.tcp; -import org.eclipse.net4j.transport.IAcceptor; +import org.eclipse.net4j.IAcceptor; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPConnector.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPConnector.java index 44685f48e3..ace6a93222 100644 --- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPConnector.java +++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPConnector.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.tcp; -import org.eclipse.net4j.transport.IConnector; +import org.eclipse.net4j.IConnector; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AbstractTransportTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AbstractTransportTest.java index 4f24c486ae..dd33863316 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AbstractTransportTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AbstractTransportTest.java @@ -17,9 +17,9 @@ import org.eclipse.net4j.internal.tcp.TCPSelectorInjector; import org.eclipse.net4j.tcp.ITCPConstants; import org.eclipse.net4j.util.lifecycle.LifecycleUtil; -import org.eclipse.internal.net4j.transport.Acceptor; -import org.eclipse.internal.net4j.transport.Connector; -import org.eclipse.internal.net4j.transport.TransportContainer; +import org.eclipse.internal.net4j.Acceptor; +import org.eclipse.internal.net4j.Connector; +import org.eclipse.internal.net4j.TransportContainer; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ClientTestProtocolFactory.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ClientTestProtocolFactory.java index a9db577f34..fcaf01e4fc 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ClientTestProtocolFactory.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ClientTestProtocolFactory.java @@ -10,10 +10,10 @@ **************************************************************************/ package org.eclipse.net4j.tests; -import org.eclipse.net4j.transport.IProtocol; +import org.eclipse.net4j.IProtocol; import org.eclipse.net4j.util.factory.ProductCreationException; -import org.eclipse.internal.net4j.transport.ClientProtocolFactory; +import org.eclipse.internal.net4j.ClientProtocolFactory; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ServerTestProtocolFactory.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ServerTestProtocolFactory.java index 847a87fe73..f2eb9d6604 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ServerTestProtocolFactory.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ServerTestProtocolFactory.java @@ -12,7 +12,7 @@ package org.eclipse.net4j.tests; import org.eclipse.net4j.util.factory.ProductCreationException; -import org.eclipse.internal.net4j.transport.ServerProtocolFactory; +import org.eclipse.internal.net4j.ServerProtocolFactory; import java.util.concurrent.CountDownLatch; diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalTest.java index 94b685ab9c..8d29c501ca 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalTest.java @@ -10,13 +10,13 @@ **************************************************************************/ package org.eclipse.net4j.tests; +import org.eclipse.net4j.IChannel; import org.eclipse.net4j.tests.signal.Request1; import org.eclipse.net4j.tests.signal.Request2; import org.eclipse.net4j.tests.signal.TestSignalProtocol; import org.eclipse.net4j.tests.signal.TestSignalServerProtocolFactory; -import org.eclipse.net4j.transport.IChannel; -import org.eclipse.internal.net4j.transport.TransportContainer; +import org.eclipse.internal.net4j.TransportContainer; import java.util.Arrays; diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SynchronizingCorrelatorTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SynchronizingCorrelatorTest.java index 6f3cd19c5b..8afbd5f538 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SynchronizingCorrelatorTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SynchronizingCorrelatorTest.java @@ -10,10 +10,9 @@ **************************************************************************/ package org.eclipse.net4j.tests; +import org.eclipse.net4j.internal.util.concurrent.SynchronizingCorrelator; import org.eclipse.net4j.util.concurrent.ISynchronizer; -import org.eclipse.internal.net4j.util.concurrent.SynchronizingCorrelator; - /** * @author Eike Stepper */ diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPTransportTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPTransportTest.java index f4545f2043..9ddc0524ac 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPTransportTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPTransportTest.java @@ -10,18 +10,18 @@ **************************************************************************/ package org.eclipse.net4j.tests; +import org.eclipse.net4j.IAcceptorEvent; +import org.eclipse.net4j.IBuffer; +import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.IConnectorChannelsEvent; import org.eclipse.net4j.stream.ChannelInputStream; import org.eclipse.net4j.stream.ChannelOutputStream; import org.eclipse.net4j.tests.signal.TestSignalServerProtocolFactory; -import org.eclipse.net4j.transport.IAcceptorEvent; -import org.eclipse.net4j.transport.IBuffer; -import org.eclipse.net4j.transport.IChannel; -import org.eclipse.net4j.transport.IConnectorChannelsEvent; import org.eclipse.net4j.util.container.IContainerDelta; import org.eclipse.net4j.util.event.IEvent; import org.eclipse.net4j.util.event.IListener; -import org.eclipse.internal.net4j.transport.TransportContainer; +import org.eclipse.internal.net4j.TransportContainer; import java.io.BufferedReader; import java.io.DataInputStream; diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TestBufferPool.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TestBufferPool.java index 895d27cf70..6053539b73 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TestBufferPool.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TestBufferPool.java @@ -10,9 +10,9 @@ **************************************************************************/ package org.eclipse.net4j.tests; -import org.eclipse.net4j.transport.IBuffer; -import org.eclipse.net4j.transport.IBufferPool; -import org.eclipse.net4j.transport.TransportUtil; +import org.eclipse.net4j.IBuffer; +import org.eclipse.net4j.IBufferPool; +import org.eclipse.net4j.TransportUtil; import org.eclipse.net4j.util.ReflectUtil; import org.eclipse.net4j.util.lifecycle.LifecycleUtil; import org.eclipse.net4j.util.om.OMPlatform; diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TestProtocol.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TestProtocol.java index 98ee2aa601..44a957bbf9 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TestProtocol.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TestProtocol.java @@ -1,8 +1,8 @@ package org.eclipse.net4j.tests; -import org.eclipse.net4j.transport.IBuffer; +import org.eclipse.net4j.IBuffer; -import org.eclipse.internal.net4j.transport.Protocol; +import org.eclipse.internal.net4j.Protocol; import java.util.concurrent.CountDownLatch; diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/Request1.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/Request1.java index a6135a365c..86343939cc 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/Request1.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/Request1.java @@ -10,8 +10,8 @@ **************************************************************************/ package org.eclipse.net4j.tests.signal; +import org.eclipse.net4j.IChannel; import org.eclipse.net4j.signal.RequestWithConfirmation; -import org.eclipse.net4j.transport.IChannel; import org.eclipse.net4j.util.stream.ExtendedDataInputStream; import org.eclipse.net4j.util.stream.ExtendedDataOutputStream; diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/Request2.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/Request2.java index 3ab8aff728..ef4b955193 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/Request2.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/Request2.java @@ -10,8 +10,8 @@ **************************************************************************/ package org.eclipse.net4j.tests.signal; +import org.eclipse.net4j.IChannel; import org.eclipse.net4j.signal.RequestWithConfirmation; -import org.eclipse.net4j.transport.IChannel; import org.eclipse.net4j.util.stream.ExtendedDataInputStream; import org.eclipse.net4j.util.stream.ExtendedDataOutputStream; diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalServerProtocolFactory.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalServerProtocolFactory.java index c4cc1596db..a710ac624a 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalServerProtocolFactory.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalServerProtocolFactory.java @@ -2,7 +2,7 @@ package org.eclipse.net4j.tests.signal; import org.eclipse.net4j.util.factory.ProductCreationException; -import org.eclipse.internal.net4j.transport.ServerProtocolFactory; +import org.eclipse.internal.net4j.ServerProtocolFactory; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/AcceptorContentProvider.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/AcceptorContentProvider.java index 1918adc4e2..b8ed10e0e4 100644 --- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/AcceptorContentProvider.java +++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/AcceptorContentProvider.java @@ -13,7 +13,7 @@ package org.eclipse.net4j.internal.ui; import org.eclipse.net4j.ui.StructuredContentProvider; import org.eclipse.net4j.util.container.IManagedContainer; -import org.eclipse.internal.net4j.transport.AcceptorFactory; +import org.eclipse.internal.net4j.AcceptorFactory; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/ConnectorContentProvider.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/ConnectorContentProvider.java index 3dd4b1fd1f..7ad129113c 100644 --- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/ConnectorContentProvider.java +++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/ConnectorContentProvider.java @@ -13,7 +13,7 @@ package org.eclipse.net4j.internal.ui; import org.eclipse.net4j.ui.StructuredContentProvider; import org.eclipse.net4j.util.container.IManagedContainer; -import org.eclipse.internal.net4j.transport.ConnectorFactory; +import org.eclipse.internal.net4j.ConnectorFactory; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/bundle/Net4jUI.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/bundle/Net4jUI.java index 387b4ad119..c12030e422 100644 --- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/bundle/Net4jUI.java +++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/bundle/Net4jUI.java @@ -10,13 +10,12 @@ **************************************************************************/ package org.eclipse.net4j.internal.ui.bundle; +import org.eclipse.net4j.internal.util.om.OSGiActivator; import org.eclipse.net4j.util.om.OMBundle; import org.eclipse.net4j.util.om.OMLogger; import org.eclipse.net4j.util.om.OMPlatform; import org.eclipse.net4j.util.om.OMTracer; -import org.eclipse.internal.net4j.util.om.OSGiActivator; - /** * @author Eike Stepper */ diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/AcceptorsView.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/AcceptorsView.java index 966bebf1c8..2d2a3c86d7 100644 --- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/AcceptorsView.java +++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/AcceptorsView.java @@ -1,8 +1,8 @@ package org.eclipse.net4j.internal.ui.views; -import org.eclipse.net4j.transport.IAcceptor; -import org.eclipse.net4j.transport.IPluginTransportContainer; -import org.eclipse.net4j.transport.ITransportContainer; +import org.eclipse.net4j.IAcceptor; +import org.eclipse.net4j.IPluginTransportContainer; +import org.eclipse.net4j.ITransportContainer; import org.eclipse.net4j.ui.actions.SafeAction; import org.eclipse.net4j.ui.views.ContainerItemProvider; import org.eclipse.net4j.ui.views.ContainerView; diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/ConnectorsView.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/ConnectorsView.java index 53145872ba..138bc77b5b 100644 --- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/ConnectorsView.java +++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/ConnectorsView.java @@ -1,8 +1,8 @@ package org.eclipse.net4j.internal.ui.views; -import org.eclipse.net4j.transport.IConnector; -import org.eclipse.net4j.transport.IPluginTransportContainer; -import org.eclipse.net4j.transport.ITransportContainer; +import org.eclipse.net4j.IConnector; +import org.eclipse.net4j.IPluginTransportContainer; +import org.eclipse.net4j.ITransportContainer; import org.eclipse.net4j.ui.actions.SafeAction; import org.eclipse.net4j.ui.views.ContainerItemProvider; import org.eclipse.net4j.ui.views.ContainerView; diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/Net4jItemProvider.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/Net4jItemProvider.java index 817a7628f7..b948935cbd 100644 --- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/Net4jItemProvider.java +++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/Net4jItemProvider.java @@ -10,10 +10,10 @@ **************************************************************************/ package org.eclipse.net4j.internal.ui.views; +import org.eclipse.net4j.IAcceptor; +import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.IConnector; import org.eclipse.net4j.internal.ui.bundle.SharedIcons; -import org.eclipse.net4j.transport.IAcceptor; -import org.eclipse.net4j.transport.IChannel; -import org.eclipse.net4j.transport.IConnector; import org.eclipse.net4j.ui.actions.SafeAction; import org.eclipse.net4j.ui.views.ContainerItemProvider; import org.eclipse.net4j.ui.views.ContainerView; diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/wizards/NewAcceptorWizard.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/wizards/NewAcceptorWizard.java index 9a31cd493b..d466ec70c4 100644 --- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/wizards/NewAcceptorWizard.java +++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/wizards/NewAcceptorWizard.java @@ -10,9 +10,9 @@ **************************************************************************/ package org.eclipse.net4j.internal.ui.wizards; +import org.eclipse.net4j.IPluginTransportContainer; +import org.eclipse.net4j.ITransportContainer; import org.eclipse.net4j.internal.ui.wizards.steps.NewAcceptorStep; -import org.eclipse.net4j.transport.IPluginTransportContainer; -import org.eclipse.net4j.transport.ITransportContainer; import org.eclipse.net4j.ui.wizards.Step; import org.eclipse.net4j.ui.wizards.SteppingNewWizard; diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/wizards/NewConnectorWizard.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/wizards/NewConnectorWizard.java index 8f1b5ee4e3..d30a72c4be 100644 --- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/wizards/NewConnectorWizard.java +++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/wizards/NewConnectorWizard.java @@ -10,9 +10,9 @@ **************************************************************************/ package org.eclipse.net4j.internal.ui.wizards; +import org.eclipse.net4j.IPluginTransportContainer; +import org.eclipse.net4j.ITransportContainer; import org.eclipse.net4j.internal.ui.wizards.steps.NewConnectorStep; -import org.eclipse.net4j.transport.IPluginTransportContainer; -import org.eclipse.net4j.transport.ITransportContainer; import org.eclipse.net4j.ui.wizards.Step; import org.eclipse.net4j.ui.wizards.SteppingNewWizard; diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/wizards/steps/NewAcceptorStep.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/wizards/steps/NewAcceptorStep.java index 7f437d30f9..8a94d9cf5f 100644 --- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/wizards/steps/NewAcceptorStep.java +++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/wizards/steps/NewAcceptorStep.java @@ -1,13 +1,13 @@ package org.eclipse.net4j.internal.ui.wizards.steps; +import org.eclipse.net4j.IPluginTransportContainer; +import org.eclipse.net4j.ITransportContainer; import org.eclipse.net4j.internal.ui.FactoryTypeContentProvider; -import org.eclipse.net4j.transport.IPluginTransportContainer; -import org.eclipse.net4j.transport.ITransportContainer; import org.eclipse.net4j.ui.wizards.ParallelStep; import org.eclipse.net4j.ui.wizards.SelectionStep; import org.eclipse.net4j.ui.wizards.StringStep; -import org.eclipse.internal.net4j.transport.AcceptorFactory; +import org.eclipse.internal.net4j.AcceptorFactory; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/wizards/steps/NewConnectorStep.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/wizards/steps/NewConnectorStep.java index 9e99f2836c..067537d6d8 100644 --- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/wizards/steps/NewConnectorStep.java +++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/wizards/steps/NewConnectorStep.java @@ -1,13 +1,13 @@ package org.eclipse.net4j.internal.ui.wizards.steps; +import org.eclipse.net4j.IPluginTransportContainer; +import org.eclipse.net4j.ITransportContainer; import org.eclipse.net4j.internal.ui.FactoryTypeContentProvider; -import org.eclipse.net4j.transport.IPluginTransportContainer; -import org.eclipse.net4j.transport.ITransportContainer; import org.eclipse.net4j.ui.wizards.ParallelStep; import org.eclipse.net4j.ui.wizards.SelectionStep; import org.eclipse.net4j.ui.wizards.StringStep; -import org.eclipse.internal.net4j.transport.ConnectorFactory; +import org.eclipse.internal.net4j.ConnectorFactory; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/wizards/steps/ProvideConnectorStep.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/wizards/steps/ProvideConnectorStep.java index 1b79ad0f69..f619996149 100644 --- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/wizards/steps/ProvideConnectorStep.java +++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/wizards/steps/ProvideConnectorStep.java @@ -1,8 +1,8 @@ package org.eclipse.net4j.internal.ui.wizards.steps; -import org.eclipse.net4j.transport.IConnector; -import org.eclipse.net4j.transport.IPluginTransportContainer; -import org.eclipse.net4j.transport.ITransportContainer; +import org.eclipse.net4j.IConnector; +import org.eclipse.net4j.IPluginTransportContainer; +import org.eclipse.net4j.ITransportContainer; import org.eclipse.net4j.ui.wizards.DecisionStep; /** diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/wizards/steps/SelectAcceptorStep.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/wizards/steps/SelectAcceptorStep.java index 3e8ed44e0e..ed01982077 100644 --- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/wizards/steps/SelectAcceptorStep.java +++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/wizards/steps/SelectAcceptorStep.java @@ -1,9 +1,9 @@ package org.eclipse.net4j.internal.ui.wizards.steps; +import org.eclipse.net4j.IAcceptor; +import org.eclipse.net4j.IPluginTransportContainer; +import org.eclipse.net4j.ITransportContainer; import org.eclipse.net4j.internal.ui.AcceptorContentProvider; -import org.eclipse.net4j.transport.IAcceptor; -import org.eclipse.net4j.transport.IPluginTransportContainer; -import org.eclipse.net4j.transport.ITransportContainer; import org.eclipse.net4j.ui.wizards.ParallelStep; import org.eclipse.net4j.ui.wizards.SelectionStep; diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/wizards/steps/SelectConnectorStep.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/wizards/steps/SelectConnectorStep.java index 14ed1a894d..83945c3a9f 100644 --- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/wizards/steps/SelectConnectorStep.java +++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/wizards/steps/SelectConnectorStep.java @@ -1,9 +1,9 @@ package org.eclipse.net4j.internal.ui.wizards.steps; +import org.eclipse.net4j.IConnector; +import org.eclipse.net4j.IPluginTransportContainer; +import org.eclipse.net4j.ITransportContainer; import org.eclipse.net4j.internal.ui.ConnectorContentProvider; -import org.eclipse.net4j.transport.IConnector; -import org.eclipse.net4j.transport.IPluginTransportContainer; -import org.eclipse.net4j.transport.ITransportContainer; import org.eclipse.net4j.ui.wizards.ParallelStep; import org.eclipse.net4j.ui.wizards.SelectionStep; diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/actions/LongRunningAction.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/actions/LongRunningAction.java index 13b381d321..32947d4fbb 100644 --- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/actions/LongRunningAction.java +++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/actions/LongRunningAction.java @@ -14,7 +14,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.internal.net4j.bundle.Net4j; +import org.eclipse.internal.net4j.bundle.OM; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.IWorkbenchPage; @@ -81,6 +81,6 @@ public abstract class LongRunningAction extends SafeAction protected IStatus handleException(Exception ex) { - return new Status(IStatus.ERROR, Net4j.BUNDLE_ID, "An error has occured.", ex); + return new Status(IStatus.ERROR, OM.BUNDLE_ID, "An error has occured.", ex); } } diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/views/ContainerItemProvider.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/views/ContainerItemProvider.java index 1eea5862be..3387dae09f 100644 --- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/views/ContainerItemProvider.java +++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/views/ContainerItemProvider.java @@ -10,12 +10,11 @@ **************************************************************************/ package org.eclipse.net4j.ui.views; +import org.eclipse.net4j.internal.util.container.ContainerEventAdapter; import org.eclipse.net4j.util.container.IContainer; import org.eclipse.net4j.util.event.IListener; import org.eclipse.net4j.util.lifecycle.LifecycleUtil; -import org.eclipse.internal.net4j.util.container.ContainerEventAdapter; - import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/views/ContainerView.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/views/ContainerView.java index 26f7e324d9..fb2c6cf7f5 100644 --- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/views/ContainerView.java +++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/views/ContainerView.java @@ -1,7 +1,7 @@ package org.eclipse.net4j.ui.views; +import org.eclipse.net4j.ITransportContainer; import org.eclipse.net4j.internal.ui.bundle.SharedIcons; -import org.eclipse.net4j.transport.ITransportContainer; import org.eclipse.net4j.ui.actions.SafeAction; import org.eclipse.jface.action.Action; diff --git a/plugins/org.eclipse.net4j.util/.classpath b/plugins/org.eclipse.net4j.util/.classpath new file mode 100644 index 0000000000..304e86186a --- /dev/null +++ b/plugins/org.eclipse.net4j.util/.classpath @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="output" path="bin"/> +</classpath> diff --git a/plugins/org.eclipse.net4j.util/.cvsignore b/plugins/org.eclipse.net4j.util/.cvsignore new file mode 100644 index 0000000000..ba077a4031 --- /dev/null +++ b/plugins/org.eclipse.net4j.util/.cvsignore @@ -0,0 +1 @@ +bin diff --git a/plugins/org.eclipse.net4j.util/.options b/plugins/org.eclipse.net4j.util/.options new file mode 100644 index 0000000000..ba57060a59 --- /dev/null +++ b/plugins/org.eclipse.net4j.util/.options @@ -0,0 +1,9 @@ +org.eclipse.net4j.util/debug = true + +org.eclipse.net4j.util/debug.lifecycle = true +org.eclipse.net4j.util/debug.lifecycle.dump = true +org.eclipse.net4j.util/debug.concurrency = true +org.eclipse.net4j.util/debug.registry = true +org.eclipse.net4j.util/debug.om = true + +org.eclipse.net4j.util/perf = false diff --git a/plugins/org.eclipse.net4j.util/.project b/plugins/org.eclipse.net4j.util/.project new file mode 100644 index 0000000000..b52e9e4cf3 --- /dev/null +++ b/plugins/org.eclipse.net4j.util/.project @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.net4j.util</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> diff --git a/plugins/org.eclipse.net4j.util/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.util/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000000..375c1cebea --- /dev/null +++ b/plugins/org.eclipse.net4j.util/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +#Mon May 21 12:12:04 CEST 2007 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/plugins/org.eclipse.net4j.util/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.util/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..46bbd30a8b --- /dev/null +++ b/plugins/org.eclipse.net4j.util/META-INF/MANIFEST.MF @@ -0,0 +1,36 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.eclipse.net4j.util;singleton:=true +Bundle-Version: 0.8.0.qualifier +Bundle-Name: %pluginName +Bundle-Vendor: %providerName +Bundle-Activator: org.eclipse.net4j.internal.util.bundle.OM$Activator +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Require-Bundle: org.eclipse.core.runtime +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;version="0.8.0", + org.eclipse.net4j.internal.util.bundle;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", + org.eclipse.net4j.internal.util.event;version="0.8.0", + org.eclipse.net4j.internal.util.factory;version="0.8.0", + org.eclipse.net4j.internal.util.lifecycle;version="0.8.0", + org.eclipse.net4j.internal.util.om;version="0.8.0", + org.eclipse.net4j.internal.util.registry;version="0.8.0", + org.eclipse.net4j.util;version="0.8.0", + org.eclipse.net4j.util.concurrent;version="0.8.0", + org.eclipse.net4j.util.container;version="0.8.0", + org.eclipse.net4j.util.container.delegate;version="0.8.0", + org.eclipse.net4j.util.event;version="0.8.0", + org.eclipse.net4j.util.factory;version="0.8.0", + org.eclipse.net4j.util.lifecycle;version="0.8.0", + org.eclipse.net4j.util.om;version="0.8.0", + org.eclipse.net4j.util.om.log;version="0.8.0", + org.eclipse.net4j.util.om.trace;version="0.8.0", + org.eclipse.net4j.util.registry;version="0.8.0", + org.eclipse.net4j.util.stream;version="0.8.0" +Eclipse-LazyStart: true diff --git a/plugins/org.eclipse.net4j.util/about.html b/plugins/org.eclipse.net4j.util/about.html new file mode 100644 index 0000000000..81a265f458 --- /dev/null +++ b/plugins/org.eclipse.net4j.util/about.html @@ -0,0 +1,42 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html> + + <head> + + <meta content="text/html; charset=ISO-8859-1" + http-equiv="Content-Type"/> + + <title>About</title> + + </head> + + <body lang="EN-US"> + + <h2>About This Content</h2> + + <p>May 17, 2007</p> + + <h3>License</h3> + + <p>The Eclipse Foundation makes available all content in this + plug-in ("Content"). Unless otherwise indicated below, + the Content is provided to you under the terms and conditions of + the Eclipse Public License Version 1.0 ("EPL"). A copy of + the EPL is available at + <a href="http://www.eclipse.org/legal/epl-v10.html"> + http://www.eclipse.org/legal/epl-v10.html</a>. For purposes of the + EPL, "Program" will mean the Content.</p> + + <p>If you did not receive this Content directly from the Eclipse + Foundation, the Content is being redistributed by another party + ("Redistributor") and different terms and conditions may + apply to your use of any object code in the Content. Check the + Redistributor's license that was provided with the Content. If + no such license exists, contact the Redistributor. Unless otherwise + indicated below, the terms and conditions of the EPL still apply to + any source code in the Content.</p> + + </body> + +</html> + diff --git a/plugins/org.eclipse.net4j.util/build.properties b/plugins/org.eclipse.net4j.util/build.properties new file mode 100644 index 0000000000..e85fe65780 --- /dev/null +++ b/plugins/org.eclipse.net4j.util/build.properties @@ -0,0 +1,12 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + .options,\ + about.html,\ + copyright.txt,\ + epl-v10.html,\ + license.html,\ + plugin.properties,\ + plugin.xml,\ + schema/ diff --git a/plugins/org.eclipse.net4j.util/copyright.txt b/plugins/org.eclipse.net4j.util/copyright.txt new file mode 100644 index 0000000000..025f15218e --- /dev/null +++ b/plugins/org.eclipse.net4j.util/copyright.txt @@ -0,0 +1,8 @@ +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
\ No newline at end of file diff --git a/plugins/org.eclipse.net4j.util/epl-v10.html b/plugins/org.eclipse.net4j.util/epl-v10.html new file mode 100644 index 0000000000..d7b88e9416 --- /dev/null +++ b/plugins/org.eclipse.net4j.util/epl-v10.html @@ -0,0 +1,319 @@ +<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head> +<meta http-equiv="Content-Type" content="text/html; charset=windows-1252"> +<meta name="ProgId" content="Word.Document"> +<meta name="Generator" content="Microsoft Word 9"> +<meta name="Originator" content="Microsoft Word 9"> +<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml> + <o:DocumentProperties> + <o:Revision>2</o:Revision> + <o:TotalTime>3</o:TotalTime> + <o:Created>2004-03-05T23:03:00Z</o:Created> + <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved> + <o:Pages>4</o:Pages> + <o:Words>1626</o:Words> + <o:Characters>9270</o:Characters> + <o:Lines>77</o:Lines> + <o:Paragraphs>18</o:Paragraphs> + <o:CharactersWithSpaces>11384</o:CharactersWithSpaces> + <o:Version>9.4402</o:Version> + </o:DocumentProperties> +</xml><![endif]--><!--[if gte mso 9]><xml> + <w:WordDocument> + <w:TrackRevisions/> + </w:WordDocument> +</xml><![endif]--> + + +<style> +<!-- + /* Font Definitions */ +@font-face + {font-family:Tahoma; + panose-1:2 11 6 4 3 5 4 4 2 4; + mso-font-charset:0; + mso-generic-font-family:swiss; + mso-font-pitch:variable; + mso-font-signature:553679495 -2147483648 8 0 66047 0;} + /* Style Definitions */ +p.MsoNormal, li.MsoNormal, div.MsoNormal + {mso-style-parent:""; + margin:0in; + margin-bottom:.0001pt; + mso-pagination:widow-orphan; + font-size:12.0pt; + font-family:"Times New Roman"; + mso-fareast-font-family:"Times New Roman";} +p + {margin-right:0in; + mso-margin-top-alt:auto; + mso-margin-bottom-alt:auto; + margin-left:0in; + mso-pagination:widow-orphan; + font-size:12.0pt; + font-family:"Times New Roman"; + mso-fareast-font-family:"Times New Roman";} +p.BalloonText, li.BalloonText, div.BalloonText + {mso-style-name:"Balloon Text"; + margin:0in; + margin-bottom:.0001pt; + mso-pagination:widow-orphan; + font-size:8.0pt; + font-family:Tahoma; + mso-fareast-font-family:"Times New Roman";} +@page Section1 + {size:8.5in 11.0in; + margin:1.0in 1.25in 1.0in 1.25in; + mso-header-margin:.5in; + mso-footer-margin:.5in; + mso-paper-source:0;} +div.Section1 + {page:Section1;} +--> +</style></head> + +<body style="" lang="EN-US"> + +<div class="Section1"> + +<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b> +</p> + +<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER +THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, +REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE +OF THIS AGREEMENT.</span> </p> + +<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p> + +<p><span style="font-size: 10pt;">"Contribution" means:</span> </p> + +<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a) +in the case of the initial Contributor, the initial code and documentation +distributed under this Agreement, and<br clear="left"> +b) in the case of each subsequent Contributor:</span></p> + +<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i) +changes to the Program, and</span></p> + +<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii) +additions to the Program;</span></p> + +<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where +such changes and/or additions to the Program originate from and are distributed +by that particular Contributor. A Contribution 'originates' from a Contributor +if it was added to the Program by such Contributor itself or anyone acting on +such Contributor's behalf. Contributions do not include additions to the +Program which: (i) are separate modules of software distributed in conjunction +with the Program under their own license agreement, and (ii) are not derivative +works of the Program. </span></p> + +<p><span style="font-size: 10pt;">"Contributor" means any person or +entity that distributes the Program.</span> </p> + +<p><span style="font-size: 10pt;">"Licensed Patents " mean patent +claims licensable by a Contributor which are necessarily infringed by the use +or sale of its Contribution alone or when combined with the Program. </span></p> + +<p><span style="font-size: 10pt;">"Program" means the Contributions +distributed in accordance with this Agreement.</span> </p> + +<p><span style="font-size: 10pt;">"Recipient" means anyone who +receives the Program under this Agreement, including all Contributors.</span> </p> + +<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p> + +<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a) +Subject to the terms of this Agreement, each Contributor hereby grants Recipient +a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly +display, publicly perform, distribute and sublicense the Contribution of such +Contributor, if any, and such derivative works, in source code and object code +form.</span></p> + +<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) +Subject to the terms of this Agreement, each Contributor hereby grants +Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free +patent license under Licensed Patents to make, use, sell, offer to sell, import +and otherwise transfer the Contribution of such Contributor, if any, in source +code and object code form. This patent license shall apply to the combination +of the Contribution and the Program if, at the time the Contribution is added +by the Contributor, such addition of the Contribution causes such combination +to be covered by the Licensed Patents. The patent license shall not apply to +any other combinations which include the Contribution. No hardware per se is +licensed hereunder. </span></p> + +<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c) +Recipient understands that although each Contributor grants the licenses to its +Contributions set forth herein, no assurances are provided by any Contributor +that the Program does not infringe the patent or other intellectual property +rights of any other entity. Each Contributor disclaims any liability to Recipient +for claims brought by any other entity based on infringement of intellectual +property rights or otherwise. As a condition to exercising the rights and +licenses granted hereunder, each Recipient hereby assumes sole responsibility +to secure any other intellectual property rights needed, if any. For example, +if a third party patent license is required to allow Recipient to distribute +the Program, it is Recipient's responsibility to acquire that license before +distributing the Program.</span></p> + +<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d) +Each Contributor represents that to its knowledge it has sufficient copyright +rights in its Contribution, if any, to grant the copyright license set forth in +this Agreement. </span></p> + +<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p> + +<p><span style="font-size: 10pt;">A Contributor may choose to distribute the +Program in object code form under its own license agreement, provided that:</span> +</p> + +<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a) +it complies with the terms and conditions of this Agreement; and</span></p> + +<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) +its license agreement:</span></p> + +<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i) +effectively disclaims on behalf of all Contributors all warranties and +conditions, express and implied, including warranties or conditions of title +and non-infringement, and implied warranties or conditions of merchantability +and fitness for a particular purpose; </span></p> + +<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii) +effectively excludes on behalf of all Contributors all liability for damages, +including direct, indirect, special, incidental and consequential damages, such +as lost profits; </span></p> + +<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii) +states that any provisions which differ from this Agreement are offered by that +Contributor alone and not by any other party; and</span></p> + +<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv) +states that source code for the Program is available from such Contributor, and +informs licensees how to obtain it in a reasonable manner on or through a +medium customarily used for software exchange.<span style="color: blue;"> </span></span></p> + +<p><span style="font-size: 10pt;">When the Program is made available in source +code form:</span> </p> + +<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a) +it must be made available under this Agreement; and </span></p> + +<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a +copy of this Agreement must be included with each copy of the Program. </span></p> + +<p><span style="font-size: 10pt;">Contributors may not remove or alter any +copyright notices contained within the Program. </span></p> + +<p><span style="font-size: 10pt;">Each Contributor must identify itself as the +originator of its Contribution, if any, in a manner that reasonably allows +subsequent Recipients to identify the originator of the Contribution. </span></p> + +<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p> + +<p><span style="font-size: 10pt;">Commercial distributors of software may +accept certain responsibilities with respect to end users, business partners +and the like. While this license is intended to facilitate the commercial use +of the Program, the Contributor who includes the Program in a commercial +product offering should do so in a manner which does not create potential +liability for other Contributors. Therefore, if a Contributor includes the +Program in a commercial product offering, such Contributor ("Commercial +Contributor") hereby agrees to defend and indemnify every other +Contributor ("Indemnified Contributor") against any losses, damages and +costs (collectively "Losses") arising from claims, lawsuits and other +legal actions brought by a third party against the Indemnified Contributor to +the extent caused by the acts or omissions of such Commercial Contributor in +connection with its distribution of the Program in a commercial product +offering. The obligations in this section do not apply to any claims or Losses +relating to any actual or alleged intellectual property infringement. In order +to qualify, an Indemnified Contributor must: a) promptly notify the Commercial +Contributor in writing of such claim, and b) allow the Commercial Contributor +to control, and cooperate with the Commercial Contributor in, the defense and +any related settlement negotiations. The Indemnified Contributor may participate +in any such claim at its own expense.</span> </p> + +<p><span style="font-size: 10pt;">For example, a Contributor might include the +Program in a commercial product offering, Product X. That Contributor is then a +Commercial Contributor. If that Commercial Contributor then makes performance +claims, or offers warranties related to Product X, those performance claims and +warranties are such Commercial Contributor's responsibility alone. Under this +section, the Commercial Contributor would have to defend claims against the +other Contributors related to those performance claims and warranties, and if a +court requires any other Contributor to pay any damages as a result, the +Commercial Contributor must pay those damages.</span> </p> + +<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p> + +<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS +AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT +WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, +WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, +MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely +responsible for determining the appropriateness of using and distributing the +Program and assumes all risks associated with its exercise of rights under this +Agreement , including but not limited to the risks and costs of program errors, +compliance with applicable laws, damage to or loss of data, programs or +equipment, and unavailability or interruption of operations. </span></p> + +<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p> + +<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS +AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF +THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF +THE POSSIBILITY OF SUCH DAMAGES.</span> </p> + +<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p> + +<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid +or unenforceable under applicable law, it shall not affect the validity or +enforceability of the remainder of the terms of this Agreement, and without +further action by the parties hereto, such provision shall be reformed to the +minimum extent necessary to make such provision valid and enforceable.</span> </p> + +<p><span style="font-size: 10pt;">If Recipient institutes patent litigation +against any entity (including a cross-claim or counterclaim in a lawsuit) +alleging that the Program itself (excluding combinations of the Program with +other software or hardware) infringes such Recipient's patent(s), then such +Recipient's rights granted under Section 2(b) shall terminate as of the date +such litigation is filed. </span></p> + +<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement +shall terminate if it fails to comply with any of the material terms or +conditions of this Agreement and does not cure such failure in a reasonable +period of time after becoming aware of such noncompliance. If all Recipient's +rights under this Agreement terminate, Recipient agrees to cease use and +distribution of the Program as soon as reasonably practicable. However, +Recipient's obligations under this Agreement and any licenses granted by +Recipient relating to the Program shall continue and survive. </span></p> + +<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute +copies of this Agreement, but in order to avoid inconsistency the Agreement is +copyrighted and may only be modified in the following manner. The Agreement +Steward reserves the right to publish new versions (including revisions) of +this Agreement from time to time. No one other than the Agreement Steward has +the right to modify this Agreement. The Eclipse Foundation is the initial +Agreement Steward. The Eclipse Foundation may assign the responsibility to +serve as the Agreement Steward to a suitable separate entity. Each new version +of the Agreement will be given a distinguishing version number. The Program +(including Contributions) may always be distributed subject to the version of +the Agreement under which it was received. In addition, after a new version of +the Agreement is published, Contributor may elect to distribute the Program +(including its Contributions) under the new version. Except as expressly stated +in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to +the intellectual property of any Contributor under this Agreement, whether +expressly, by implication, estoppel or otherwise. All rights in the Program not +expressly granted under this Agreement are reserved.</span> </p> + +<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the +State of New York and the intellectual property laws of the United States of +America. No party to this Agreement will bring a legal action under this +Agreement more than one year after the cause of action arose. Each party waives +its rights to a jury trial in any resulting litigation.</span> </p> + +<p class="MsoNormal"><!--[if !supportEmptyParas]--> <!--[endif]--><o:p></o:p></p> + +</div> + +</body></html>
\ No newline at end of file diff --git a/plugins/org.eclipse.net4j.util/license.html b/plugins/org.eclipse.net4j.util/license.html new file mode 100644 index 0000000000..d7b88e9416 --- /dev/null +++ b/plugins/org.eclipse.net4j.util/license.html @@ -0,0 +1,319 @@ +<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head> +<meta http-equiv="Content-Type" content="text/html; charset=windows-1252"> +<meta name="ProgId" content="Word.Document"> +<meta name="Generator" content="Microsoft Word 9"> +<meta name="Originator" content="Microsoft Word 9"> +<link rel="File-List" href="http://www.eclipse.org/org/documents/Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml"><title>Eclipse Public License - Version 1.0</title><!--[if gte mso 9]><xml> + <o:DocumentProperties> + <o:Revision>2</o:Revision> + <o:TotalTime>3</o:TotalTime> + <o:Created>2004-03-05T23:03:00Z</o:Created> + <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved> + <o:Pages>4</o:Pages> + <o:Words>1626</o:Words> + <o:Characters>9270</o:Characters> + <o:Lines>77</o:Lines> + <o:Paragraphs>18</o:Paragraphs> + <o:CharactersWithSpaces>11384</o:CharactersWithSpaces> + <o:Version>9.4402</o:Version> + </o:DocumentProperties> +</xml><![endif]--><!--[if gte mso 9]><xml> + <w:WordDocument> + <w:TrackRevisions/> + </w:WordDocument> +</xml><![endif]--> + + +<style> +<!-- + /* Font Definitions */ +@font-face + {font-family:Tahoma; + panose-1:2 11 6 4 3 5 4 4 2 4; + mso-font-charset:0; + mso-generic-font-family:swiss; + mso-font-pitch:variable; + mso-font-signature:553679495 -2147483648 8 0 66047 0;} + /* Style Definitions */ +p.MsoNormal, li.MsoNormal, div.MsoNormal + {mso-style-parent:""; + margin:0in; + margin-bottom:.0001pt; + mso-pagination:widow-orphan; + font-size:12.0pt; + font-family:"Times New Roman"; + mso-fareast-font-family:"Times New Roman";} +p + {margin-right:0in; + mso-margin-top-alt:auto; + mso-margin-bottom-alt:auto; + margin-left:0in; + mso-pagination:widow-orphan; + font-size:12.0pt; + font-family:"Times New Roman"; + mso-fareast-font-family:"Times New Roman";} +p.BalloonText, li.BalloonText, div.BalloonText + {mso-style-name:"Balloon Text"; + margin:0in; + margin-bottom:.0001pt; + mso-pagination:widow-orphan; + font-size:8.0pt; + font-family:Tahoma; + mso-fareast-font-family:"Times New Roman";} +@page Section1 + {size:8.5in 11.0in; + margin:1.0in 1.25in 1.0in 1.25in; + mso-header-margin:.5in; + mso-footer-margin:.5in; + mso-paper-source:0;} +div.Section1 + {page:Section1;} +--> +</style></head> + +<body style="" lang="EN-US"> + +<div class="Section1"> + +<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b> +</p> + +<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER +THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, +REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE +OF THIS AGREEMENT.</span> </p> + +<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p> + +<p><span style="font-size: 10pt;">"Contribution" means:</span> </p> + +<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a) +in the case of the initial Contributor, the initial code and documentation +distributed under this Agreement, and<br clear="left"> +b) in the case of each subsequent Contributor:</span></p> + +<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i) +changes to the Program, and</span></p> + +<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii) +additions to the Program;</span></p> + +<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">where +such changes and/or additions to the Program originate from and are distributed +by that particular Contributor. A Contribution 'originates' from a Contributor +if it was added to the Program by such Contributor itself or anyone acting on +such Contributor's behalf. Contributions do not include additions to the +Program which: (i) are separate modules of software distributed in conjunction +with the Program under their own license agreement, and (ii) are not derivative +works of the Program. </span></p> + +<p><span style="font-size: 10pt;">"Contributor" means any person or +entity that distributes the Program.</span> </p> + +<p><span style="font-size: 10pt;">"Licensed Patents " mean patent +claims licensable by a Contributor which are necessarily infringed by the use +or sale of its Contribution alone or when combined with the Program. </span></p> + +<p><span style="font-size: 10pt;">"Program" means the Contributions +distributed in accordance with this Agreement.</span> </p> + +<p><span style="font-size: 10pt;">"Recipient" means anyone who +receives the Program under this Agreement, including all Contributors.</span> </p> + +<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p> + +<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a) +Subject to the terms of this Agreement, each Contributor hereby grants Recipient +a non-exclusive, worldwide, royalty-free copyright license to<span style="color: red;"> </span>reproduce, prepare derivative works of, publicly +display, publicly perform, distribute and sublicense the Contribution of such +Contributor, if any, and such derivative works, in source code and object code +form.</span></p> + +<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) +Subject to the terms of this Agreement, each Contributor hereby grants +Recipient a non-exclusive, worldwide,<span style="color: green;"> </span>royalty-free +patent license under Licensed Patents to make, use, sell, offer to sell, import +and otherwise transfer the Contribution of such Contributor, if any, in source +code and object code form. This patent license shall apply to the combination +of the Contribution and the Program if, at the time the Contribution is added +by the Contributor, such addition of the Contribution causes such combination +to be covered by the Licensed Patents. The patent license shall not apply to +any other combinations which include the Contribution. No hardware per se is +licensed hereunder. </span></p> + +<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">c) +Recipient understands that although each Contributor grants the licenses to its +Contributions set forth herein, no assurances are provided by any Contributor +that the Program does not infringe the patent or other intellectual property +rights of any other entity. Each Contributor disclaims any liability to Recipient +for claims brought by any other entity based on infringement of intellectual +property rights or otherwise. As a condition to exercising the rights and +licenses granted hereunder, each Recipient hereby assumes sole responsibility +to secure any other intellectual property rights needed, if any. For example, +if a third party patent license is required to allow Recipient to distribute +the Program, it is Recipient's responsibility to acquire that license before +distributing the Program.</span></p> + +<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">d) +Each Contributor represents that to its knowledge it has sufficient copyright +rights in its Contribution, if any, to grant the copyright license set forth in +this Agreement. </span></p> + +<p><b><span style="font-size: 10pt;">3. REQUIREMENTS</span></b> </p> + +<p><span style="font-size: 10pt;">A Contributor may choose to distribute the +Program in object code form under its own license agreement, provided that:</span> +</p> + +<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a) +it complies with the terms and conditions of this Agreement; and</span></p> + +<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) +its license agreement:</span></p> + +<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">i) +effectively disclaims on behalf of all Contributors all warranties and +conditions, express and implied, including warranties or conditions of title +and non-infringement, and implied warranties or conditions of merchantability +and fitness for a particular purpose; </span></p> + +<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii) +effectively excludes on behalf of all Contributors all liability for damages, +including direct, indirect, special, incidental and consequential damages, such +as lost profits; </span></p> + +<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iii) +states that any provisions which differ from this Agreement are offered by that +Contributor alone and not by any other party; and</span></p> + +<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">iv) +states that source code for the Program is available from such Contributor, and +informs licensees how to obtain it in a reasonable manner on or through a +medium customarily used for software exchange.<span style="color: blue;"> </span></span></p> + +<p><span style="font-size: 10pt;">When the Program is made available in source +code form:</span> </p> + +<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a) +it must be made available under this Agreement; and </span></p> + +<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a +copy of this Agreement must be included with each copy of the Program. </span></p> + +<p><span style="font-size: 10pt;">Contributors may not remove or alter any +copyright notices contained within the Program. </span></p> + +<p><span style="font-size: 10pt;">Each Contributor must identify itself as the +originator of its Contribution, if any, in a manner that reasonably allows +subsequent Recipients to identify the originator of the Contribution. </span></p> + +<p><b><span style="font-size: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p> + +<p><span style="font-size: 10pt;">Commercial distributors of software may +accept certain responsibilities with respect to end users, business partners +and the like. While this license is intended to facilitate the commercial use +of the Program, the Contributor who includes the Program in a commercial +product offering should do so in a manner which does not create potential +liability for other Contributors. Therefore, if a Contributor includes the +Program in a commercial product offering, such Contributor ("Commercial +Contributor") hereby agrees to defend and indemnify every other +Contributor ("Indemnified Contributor") against any losses, damages and +costs (collectively "Losses") arising from claims, lawsuits and other +legal actions brought by a third party against the Indemnified Contributor to +the extent caused by the acts or omissions of such Commercial Contributor in +connection with its distribution of the Program in a commercial product +offering. The obligations in this section do not apply to any claims or Losses +relating to any actual or alleged intellectual property infringement. In order +to qualify, an Indemnified Contributor must: a) promptly notify the Commercial +Contributor in writing of such claim, and b) allow the Commercial Contributor +to control, and cooperate with the Commercial Contributor in, the defense and +any related settlement negotiations. The Indemnified Contributor may participate +in any such claim at its own expense.</span> </p> + +<p><span style="font-size: 10pt;">For example, a Contributor might include the +Program in a commercial product offering, Product X. That Contributor is then a +Commercial Contributor. If that Commercial Contributor then makes performance +claims, or offers warranties related to Product X, those performance claims and +warranties are such Commercial Contributor's responsibility alone. Under this +section, the Commercial Contributor would have to defend claims against the +other Contributors related to those performance claims and warranties, and if a +court requires any other Contributor to pay any damages as a result, the +Commercial Contributor must pay those damages.</span> </p> + +<p><b><span style="font-size: 10pt;">5. NO WARRANTY</span></b> </p> + +<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS +AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT +WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, +WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, +MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely +responsible for determining the appropriateness of using and distributing the +Program and assumes all risks associated with its exercise of rights under this +Agreement , including but not limited to the risks and costs of program errors, +compliance with applicable laws, damage to or loss of data, programs or +equipment, and unavailability or interruption of operations. </span></p> + +<p><b><span style="font-size: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p> + +<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS +AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF +THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF +THE POSSIBILITY OF SUCH DAMAGES.</span> </p> + +<p><b><span style="font-size: 10pt;">7. GENERAL</span></b> </p> + +<p><span style="font-size: 10pt;">If any provision of this Agreement is invalid +or unenforceable under applicable law, it shall not affect the validity or +enforceability of the remainder of the terms of this Agreement, and without +further action by the parties hereto, such provision shall be reformed to the +minimum extent necessary to make such provision valid and enforceable.</span> </p> + +<p><span style="font-size: 10pt;">If Recipient institutes patent litigation +against any entity (including a cross-claim or counterclaim in a lawsuit) +alleging that the Program itself (excluding combinations of the Program with +other software or hardware) infringes such Recipient's patent(s), then such +Recipient's rights granted under Section 2(b) shall terminate as of the date +such litigation is filed. </span></p> + +<p><span style="font-size: 10pt;">All Recipient's rights under this Agreement +shall terminate if it fails to comply with any of the material terms or +conditions of this Agreement and does not cure such failure in a reasonable +period of time after becoming aware of such noncompliance. If all Recipient's +rights under this Agreement terminate, Recipient agrees to cease use and +distribution of the Program as soon as reasonably practicable. However, +Recipient's obligations under this Agreement and any licenses granted by +Recipient relating to the Program shall continue and survive. </span></p> + +<p><span style="font-size: 10pt;">Everyone is permitted to copy and distribute +copies of this Agreement, but in order to avoid inconsistency the Agreement is +copyrighted and may only be modified in the following manner. The Agreement +Steward reserves the right to publish new versions (including revisions) of +this Agreement from time to time. No one other than the Agreement Steward has +the right to modify this Agreement. The Eclipse Foundation is the initial +Agreement Steward. The Eclipse Foundation may assign the responsibility to +serve as the Agreement Steward to a suitable separate entity. Each new version +of the Agreement will be given a distinguishing version number. The Program +(including Contributions) may always be distributed subject to the version of +the Agreement under which it was received. In addition, after a new version of +the Agreement is published, Contributor may elect to distribute the Program +(including its Contributions) under the new version. Except as expressly stated +in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to +the intellectual property of any Contributor under this Agreement, whether +expressly, by implication, estoppel or otherwise. All rights in the Program not +expressly granted under this Agreement are reserved.</span> </p> + +<p><span style="font-size: 10pt;">This Agreement is governed by the laws of the +State of New York and the intellectual property laws of the United States of +America. No party to this Agreement will bring a legal action under this +Agreement more than one year after the cause of action arose. Each party waives +its rights to a jury trial in any resulting litigation.</span> </p> + +<p class="MsoNormal"><!--[if !supportEmptyParas]--> <!--[endif]--><o:p></o:p></p> + +</div> + +</body></html>
\ No newline at end of file diff --git a/plugins/org.eclipse.net4j.util/plugin.properties b/plugins/org.eclipse.net4j.util/plugin.properties new file mode 100644 index 0000000000..dbb165f354 --- /dev/null +++ b/plugins/org.eclipse.net4j.util/plugin.properties @@ -0,0 +1,33 @@ +# /** +# * <copyright> +# * +# * 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 +# * +# * </copyright> +# * +# * $Id$ +# */ + +# NLS_MESSAGEFORMAT_VAR + +# ============================================================================== +# Do not change the properties between this line and the last line containing: +# %%% END OF TRANSLATED PROPERTIES %%% +# Instead, either redefine an existing property, or create a new property, +# append it to the end of the file, and change the code to use the new name. +# ============================================================================== + +pluginName=Net4j +providerName=Eclipse.org + +# ============================================================================== +# %%% END OF TRANSLATED PROPERTIES %%% +# The above properties have been shipped for translation. +# ============================================================================== diff --git a/plugins/org.eclipse.net4j.util/plugin.xml b/plugins/org.eclipse.net4j.util/plugin.xml new file mode 100644 index 0000000000..158fa0e3eb --- /dev/null +++ b/plugins/org.eclipse.net4j.util/plugin.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.2"?> + +<plugin> + + <extension-point id="factories" name="Factories" schema="schema/factories.exsd"/> + <extension-point id="elementProcessors" name="Element Processors" schema="schema/elementProcessors.exsd"/> + +</plugin> diff --git a/plugins/org.eclipse.net4j.util/schema/elementProcessors.exsd b/plugins/org.eclipse.net4j.util/schema/elementProcessors.exsd new file mode 100644 index 0000000000..9845086cc2 --- /dev/null +++ b/plugins/org.eclipse.net4j.util/schema/elementProcessors.exsd @@ -0,0 +1,105 @@ +<?xml version='1.0' encoding='UTF-8'?> +<!-- Schema file written by PDE --> +<schema targetNamespace="org.eclipse.net4j"> +<annotation> + <appInfo> + <meta.schema plugin="org.eclipse.net4j" id="elementProcessors" name="Element Processors"/> + </appInfo> + <documentation> + [Enter description of this extension point.] + </documentation> + </annotation> + + <element name="extension"> + <complexType> + <sequence> + <element ref="elementProcessor" minOccurs="1" maxOccurs="unbounded"/> + </sequence> + <attribute name="point" type="string" use="required"> + <annotation> + <documentation> + + </documentation> + </annotation> + </attribute> + <attribute name="id" type="string"> + <annotation> + <documentation> + + </documentation> + </annotation> + </attribute> + <attribute name="name" type="string"> + <annotation> + <documentation> + + </documentation> + <appInfo> + <meta.attribute translatable="true"/> + </appInfo> + </annotation> + </attribute> + </complexType> + </element> + + <element name="elementProcessor"> + <complexType> + <attribute name="class" type="string" use="required"> + <annotation> + <documentation> + + </documentation> + <appInfo> + <meta.attribute kind="java"/> + </appInfo> + </annotation> + </attribute> + </complexType> + </element> + + <annotation> + <appInfo> + <meta.section type="since"/> + </appInfo> + <documentation> + [Enter the first release in which this extension point appears.] + </documentation> + </annotation> + + <annotation> + <appInfo> + <meta.section type="examples"/> + </appInfo> + <documentation> + [Enter extension point usage example here.] + </documentation> + </annotation> + + <annotation> + <appInfo> + <meta.section type="apiInfo"/> + </appInfo> + <documentation> + [Enter API information here.] + </documentation> + </annotation> + + <annotation> + <appInfo> + <meta.section type="implementation"/> + </appInfo> + <documentation> + [Enter information about supplied implementation of this extension point.] + </documentation> + </annotation> + + <annotation> + <appInfo> + <meta.section type="copyright"/> + </appInfo> + <documentation> + + </documentation> + </annotation> + +</schema> diff --git a/plugins/org.eclipse.net4j.util/schema/factories.exsd b/plugins/org.eclipse.net4j.util/schema/factories.exsd new file mode 100644 index 0000000000..b755309df1 --- /dev/null +++ b/plugins/org.eclipse.net4j.util/schema/factories.exsd @@ -0,0 +1,124 @@ +<?xml version='1.0' encoding='UTF-8'?> +<!-- Schema file written by PDE --> +<schema targetNamespace="org.eclipse.net4j"> +<annotation> + <appInfo> + <meta.schema plugin="org.eclipse.net4j" id="factories" name="Factories"/> + </appInfo> + <documentation> + [Enter description of this extension point.] + </documentation> + </annotation> + + <element name="extension"> + <complexType> + <sequence> + <element ref="factory" minOccurs="1" maxOccurs="unbounded"/> + </sequence> + <attribute name="point" type="string" use="required"> + <annotation> + <documentation> + + </documentation> + </annotation> + </attribute> + <attribute name="id" type="string"> + <annotation> + <documentation> + + </documentation> + </annotation> + </attribute> + <attribute name="name" type="string"> + <annotation> + <documentation> + + </documentation> + <appInfo> + <meta.attribute translatable="true"/> + </appInfo> + </annotation> + </attribute> + </complexType> + </element> + + <element name="factory"> + <annotation> + <appInfo> + <meta.element labelAttribute="class"/> + </appInfo> + </annotation> + <complexType> + <attribute name="productGroup" type="string" use="required"> + <annotation> + <documentation> + + </documentation> + </annotation> + </attribute> + <attribute name="type" type="string" use="required"> + <annotation> + <documentation> + + </documentation> + </annotation> + </attribute> + <attribute name="class" type="string" use="required"> + <annotation> + <documentation> + + </documentation> + <appInfo> + <meta.attribute kind="java" basedOn="org.eclipse.net4j.util.factory.IFactory"/> + </appInfo> + </annotation> + </attribute> + </complexType> + </element> + + <annotation> + <appInfo> + <meta.section type="since"/> + </appInfo> + <documentation> + [Enter the first release in which this extension point appears.] + </documentation> + </annotation> + + <annotation> + <appInfo> + <meta.section type="examples"/> + </appInfo> + <documentation> + [Enter extension point usage example here.] + </documentation> + </annotation> + + <annotation> + <appInfo> + <meta.section type="apiInfo"/> + </appInfo> + <documentation> + [Enter API information here.] + </documentation> + </annotation> + + <annotation> + <appInfo> + <meta.section type="implementation"/> + </appInfo> + <documentation> + [Enter information about supplied implementation of this extension point.] + </documentation> + </annotation> + + <annotation> + <appInfo> + <meta.section type="copyright"/> + </appInfo> + <documentation> + + </documentation> + </annotation> + +</schema> diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/HashBag.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/HashBag.java index 0654754088..f48ed213b9 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/HashBag.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/HashBag.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.util; +package org.eclipse.net4j.internal.util; import java.util.Collection; import java.util.HashMap; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/Value.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/Value.java index 484357c4d6..388d6fff14 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/Value.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/Value.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.util; +package org.eclipse.net4j.internal.util; import java.io.Serializable; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/AbstractOMBundle.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractOMBundle.java index 8ae99c1546..c365e9e04c 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/AbstractOMBundle.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractOMBundle.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.bundle; +package org.eclipse.net4j.internal.util.bundle; import org.eclipse.net4j.util.IOUtil; import org.eclipse.net4j.util.ReflectUtil; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/AbstractOMPlatform.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractOMPlatform.java index b48fa3283f..b485ae8d9a 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/AbstractOMPlatform.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractOMPlatform.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.bundle; +package org.eclipse.net4j.internal.util.bundle; import org.eclipse.net4j.util.om.OMBundle; import org.eclipse.net4j.util.om.OMLogHandler; @@ -164,7 +164,7 @@ public abstract class AbstractOMPlatform implements OMPlatform { if (__TRACER__ == null) { - __TRACER__ = new ContextTracer(Net4j.DEBUG_OM, AbstractOMPlatform.class); + __TRACER__ = new ContextTracer(OM.DEBUG_OM, AbstractOMPlatform.class); } return __TRACER__; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/LegacyBundle.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/LegacyBundle.java index ccbe2aabd8..3a1c676d79 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/LegacyBundle.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/LegacyBundle.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.bundle; +package org.eclipse.net4j.internal.util.bundle; import org.eclipse.net4j.util.IOUtil; import org.eclipse.net4j.util.ReflectUtil; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/LegacyPlatform.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/LegacyPlatform.java index 9d60b6ea58..a442b8ae4c 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/LegacyPlatform.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/LegacyPlatform.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.bundle; +package org.eclipse.net4j.internal.util.bundle; import org.eclipse.net4j.util.om.OMBundle; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/Net4j.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OM.java index 5966d48bc2..349a17377b 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/Net4j.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OM.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.bundle; +package org.eclipse.net4j.internal.util.bundle; import org.eclipse.net4j.util.om.OMBundle; import org.eclipse.net4j.util.om.OMLogger; @@ -25,11 +25,11 @@ import org.osgi.framework.BundleContext; /** * @author Eike Stepper */ -public final class Net4j +public final class OM { - public static final String BUNDLE_ID = "org.eclipse.net4j"; //$NON-NLS-1$ + public static final String BUNDLE_ID = "org.eclipse.net4j.util"; //$NON-NLS-1$ - public static final OMBundle BUNDLE = OMPlatform.INSTANCE.bundle(BUNDLE_ID, Net4j.class); + public static final OMBundle BUNDLE = OMPlatform.INSTANCE.bundle(BUNDLE_ID, OM.class); public static final OMTracer DEBUG = BUNDLE.tracer("debug"); //$NON-NLS-1$ @@ -43,27 +43,13 @@ public final class Net4j public static final OMTracer DEBUG_OM = DEBUG.tracer("om"); //$NON-NLS-1$ - public static final OMTracer DEBUG_BUFFER = DEBUG.tracer("buffer"); //$NON-NLS-1$ - - public static final OMTracer DEBUG_BUFFER_STREAM = DEBUG_BUFFER.tracer("stream"); //$NON-NLS-1$ - - public static final OMTracer DEBUG_CHANNEL = DEBUG.tracer("channel"); //$NON-NLS-1$ - - public static final OMTracer DEBUG_SELECTOR = DEBUG.tracer("selector"); //$NON-NLS-1$ - - public static final OMTracer DEBUG_ACCEPTOR = DEBUG.tracer("acceptor"); //$NON-NLS-1$ - - public static final OMTracer DEBUG_CONNECTOR = DEBUG.tracer("connector"); //$NON-NLS-1$ - - public static final OMTracer DEBUG_SIGNAL = DEBUG.tracer("signal"); //$NON-NLS-1$ - public static final OMTracer PERF = BUNDLE.tracer("perf"); //$NON-NLS-1$ public static final OMLogger LOG = BUNDLE.logger(); - private static final ContextTracer TRACER = new ContextTracer(Net4j.DEBUG_OM, Net4j.class); + private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_OM, OM.class); - private Net4j() + private OM() { } @@ -75,7 +61,7 @@ public final class Net4j public void start(BundleContext context) throws Exception { AbstractOMPlatform.systemContext = context; - Net4j.BUNDLE.setBundleContext(context); + OM.BUNDLE.setBundleContext(context); PrintTraceHandler.CONSOLE.setPattern("{6} [{0}] {5}"); AbstractOMPlatform.INSTANCE.addTraceHandler(PrintTraceHandler.CONSOLE); @@ -94,9 +80,8 @@ public final class Net4j public void stop(BundleContext context) throws Exception { - PluginTransportContainer.dispose(); traceStop(context); - Net4j.BUNDLE.setBundleContext(null); + OM.BUNDLE.setBundleContext(null); AbstractOMPlatform.systemContext = null; } diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OMLoggerImpl.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OMLoggerImpl.java index 28167d4789..4fdde35e68 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OMLoggerImpl.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OMLoggerImpl.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.bundle; +package org.eclipse.net4j.internal.util.bundle; import org.eclipse.net4j.util.om.OMBundle; import org.eclipse.net4j.util.om.OMLogger; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OMTraceHandlerEventImpl.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OMTraceHandlerEventImpl.java index b9511e9290..6eae514f06 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OMTraceHandlerEventImpl.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OMTraceHandlerEventImpl.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.bundle; +package org.eclipse.net4j.internal.util.bundle; import org.eclipse.net4j.util.om.OMTraceHandler; import org.eclipse.net4j.util.om.OMTracer; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OMTracerImpl.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OMTracerImpl.java index 2572172653..c5c29f2a0c 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OMTracerImpl.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OMTracerImpl.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.bundle; +package org.eclipse.net4j.internal.util.bundle; import org.eclipse.net4j.util.om.OMBundle; import org.eclipse.net4j.util.om.OMTracer; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OSGiBundle.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OSGiBundle.java index c14bd0a8ac..29c0c9172a 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OSGiBundle.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OSGiBundle.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.bundle; +package org.eclipse.net4j.internal.util.bundle; import org.eclipse.net4j.util.IOUtil; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OSGiPlatform.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OSGiPlatform.java index 4b1c7bf67b..97ee1222b4 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OSGiPlatform.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OSGiPlatform.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.bundle; +package org.eclipse.net4j.internal.util.bundle; import org.eclipse.net4j.util.om.OMBundle; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/concurrent/AsynchronousWorkSerializer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/AsynchronousWorkSerializer.java index 7d1387b215..f0f4f8668f 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/concurrent/AsynchronousWorkSerializer.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/AsynchronousWorkSerializer.java @@ -8,13 +8,12 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.util.concurrent; +package org.eclipse.net4j.internal.util.concurrent; +import org.eclipse.net4j.internal.util.bundle.OM; import org.eclipse.net4j.util.concurrent.IWorkSerializer; import org.eclipse.net4j.util.om.trace.ContextTracer; -import org.eclipse.internal.net4j.bundle.Net4j; - import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ExecutorService; @@ -24,8 +23,7 @@ import java.util.concurrent.ExecutorService; */ public class AsynchronousWorkSerializer implements IWorkSerializer, Runnable { - private static final ContextTracer TRACER = new ContextTracer(Net4j.DEBUG_CONCURRENCY, - AsynchronousWorkSerializer.class); + private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_CONCURRENCY, AsynchronousWorkSerializer.class); private ExecutorService executorService; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/concurrent/NamedExecutorService.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/NamedExecutorService.java index d5121b553f..e8ec5908d4 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/concurrent/NamedExecutorService.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/NamedExecutorService.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.util.concurrent; +package org.eclipse.net4j.internal.util.concurrent; import java.text.MessageFormat; import java.util.Collection; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/concurrent/ResultSynchronizer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/ResultSynchronizer.java index 0eb4ffc2e6..9c85980074 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/concurrent/ResultSynchronizer.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/ResultSynchronizer.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.util.concurrent; +package org.eclipse.net4j.internal.util.concurrent; import org.eclipse.net4j.util.concurrent.ISynchronizer; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/concurrent/RoundRobinList.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/RoundRobinList.java index acb3e854b3..354b985b71 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/concurrent/RoundRobinList.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/RoundRobinList.java @@ -1,4 +1,4 @@ -package org.eclipse.internal.net4j.util.concurrent; +package org.eclipse.net4j.internal.util.concurrent; import java.util.Collection; import java.util.Iterator; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/concurrent/SynchronizingCorrelator.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/SynchronizingCorrelator.java index 239695a512..ce109f6c6a 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/concurrent/SynchronizingCorrelator.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/SynchronizingCorrelator.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.util.concurrent; +package org.eclipse.net4j.internal.util.concurrent; import org.eclipse.net4j.util.concurrent.ICorrelator; import org.eclipse.net4j.util.concurrent.ISynchronizer; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/concurrent/SynchronousWorkSerializer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/SynchronousWorkSerializer.java index f1b692d4bd..99ebcf5c82 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/concurrent/SynchronousWorkSerializer.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/SynchronousWorkSerializer.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.util.concurrent; +package org.eclipse.net4j.internal.util.concurrent; import org.eclipse.net4j.util.concurrent.IWorkSerializer; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/ContainerDelta.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/ContainerDelta.java index e8c7b0f67f..4cabebd1cb 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/ContainerDelta.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/ContainerDelta.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.util.container; +package org.eclipse.net4j.internal.util.container; import org.eclipse.net4j.util.container.IContainerDelta; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/ContainerEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/ContainerEvent.java index e07194256d..8d94cabe0f 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/ContainerEvent.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/ContainerEvent.java @@ -8,8 +8,9 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.util.container; +package org.eclipse.net4j.internal.util.container; +import org.eclipse.net4j.internal.util.event.Event; import org.eclipse.net4j.util.container.IContainer; import org.eclipse.net4j.util.container.IContainerDelta; import org.eclipse.net4j.util.container.IContainerEvent; @@ -17,8 +18,6 @@ import org.eclipse.net4j.util.container.IContainerEventVisitor; import org.eclipse.net4j.util.container.IContainerDelta.Kind; import org.eclipse.net4j.util.container.IContainerEventVisitor.Filtered; -import org.eclipse.internal.net4j.util.event.Event; - import java.util.ArrayList; import java.util.List; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/ContainerEventAdapter.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/ContainerEventAdapter.java index 5ee460d3ed..024e4eead0 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/ContainerEventAdapter.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/ContainerEventAdapter.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.util.container; +package org.eclipse.net4j.internal.util.container; import org.eclipse.net4j.util.container.IContainer; import org.eclipse.net4j.util.container.IContainerEvent; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/LifecycleEventConverter.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/LifecycleEventConverter.java index 751103ac7a..31fe32d2a3 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/LifecycleEventConverter.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/LifecycleEventConverter.java @@ -8,10 +8,9 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.util.container; +package org.eclipse.net4j.internal.util.container; -import org.eclipse.net4j.transport.IChannel; -import org.eclipse.net4j.transport.IConnector; +import org.eclipse.net4j.internal.util.event.Notifier; import org.eclipse.net4j.util.container.IContainer; import org.eclipse.net4j.util.container.IContainerDelta; import org.eclipse.net4j.util.container.IContainerEvent; @@ -21,8 +20,6 @@ import org.eclipse.net4j.util.event.IListener; import org.eclipse.net4j.util.event.INotifier; import org.eclipse.net4j.util.lifecycle.ILifecycleEvent; -import org.eclipse.internal.net4j.util.event.Notifier; - /** * Is registered with each {@link IChannel} of this {@link IConnector}. * <p> diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/ManagedContainer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/ManagedContainer.java index 8507761628..ae270df2d5 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/ManagedContainer.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/ManagedContainer.java @@ -8,8 +8,13 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.util.container; +package org.eclipse.net4j.internal.util.container; +import org.eclipse.net4j.internal.util.bundle.OM; +import org.eclipse.net4j.internal.util.factory.FactoryKey; +import org.eclipse.net4j.internal.util.lifecycle.Lifecycle; +import org.eclipse.net4j.internal.util.lifecycle.LifecycleEventAdapter; +import org.eclipse.net4j.internal.util.registry.HashMapRegistry; import org.eclipse.net4j.util.ObjectUtil; import org.eclipse.net4j.util.container.IContainerDelta; import org.eclipse.net4j.util.container.IElementProcessor; @@ -22,12 +27,6 @@ import org.eclipse.net4j.util.lifecycle.ILifecycle; import org.eclipse.net4j.util.lifecycle.LifecycleUtil; import org.eclipse.net4j.util.registry.IRegistry; -import org.eclipse.internal.net4j.bundle.Net4j; -import org.eclipse.internal.net4j.util.factory.FactoryKey; -import org.eclipse.internal.net4j.util.lifecycle.Lifecycle; -import org.eclipse.internal.net4j.util.lifecycle.LifecycleEventAdapter; -import org.eclipse.internal.net4j.util.registry.HashMapRegistry; - import java.io.IOException; import java.io.InputStream; import java.io.ObjectInputStream; @@ -411,7 +410,7 @@ public class ManagedContainer extends Lifecycle implements IManagedContainer } catch (RuntimeException ex) { - Net4j.LOG.error(ex); + OM.LOG.error(ex); } } diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/PluginElementProcessorList.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/PluginElementProcessorList.java index 8359e01c67..46d6b109e6 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/PluginElementProcessorList.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/PluginElementProcessorList.java @@ -8,8 +8,10 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.util.container; +package org.eclipse.net4j.internal.util.container; +import org.eclipse.net4j.internal.util.bundle.OM; +import org.eclipse.net4j.internal.util.lifecycle.Lifecycle; import org.eclipse.net4j.util.container.IElementProcessor; import org.eclipse.core.runtime.IConfigurationElement; @@ -18,8 +20,6 @@ import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.core.runtime.IRegistryChangeEvent; import org.eclipse.core.runtime.IRegistryChangeListener; import org.eclipse.core.runtime.Platform; -import org.eclipse.internal.net4j.bundle.Net4j; -import org.eclipse.internal.net4j.util.lifecycle.Lifecycle; import java.util.ArrayList; import java.util.Collection; @@ -34,7 +34,7 @@ public class PluginElementProcessorList extends Lifecycle implements List<IEleme { private static final String ATTR_CLASS = "class"; - public static final String NAMESPACE = Net4j.BUNDLE_ID; + public static final String NAMESPACE = OM.BUNDLE_ID; public static final String EXT_POINT = "elementProcessors"; @@ -48,7 +48,7 @@ public class PluginElementProcessorList extends Lifecycle implements List<IEleme for (IExtensionDelta delta : deltas) { // TODO Handle ExtensionDelta - Net4j.LOG.warn("ExtensionDelta not handled: " + delta); + OM.LOG.warn("ExtensionDelta not handled: " + delta); } } }; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/SingleDeltaContainerEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/SingleDeltaContainerEvent.java index b00b059f3a..10ffc6a160 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/SingleDeltaContainerEvent.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/SingleDeltaContainerEvent.java @@ -8,8 +8,9 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.util.container; +package org.eclipse.net4j.internal.util.container; +import org.eclipse.net4j.internal.util.event.Event; import org.eclipse.net4j.util.container.IContainer; import org.eclipse.net4j.util.container.IContainerDelta; import org.eclipse.net4j.util.container.IContainerEvent; @@ -17,8 +18,6 @@ import org.eclipse.net4j.util.container.IContainerEventVisitor; import org.eclipse.net4j.util.container.IContainerDelta.Kind; import org.eclipse.net4j.util.container.IContainerEventVisitor.Filtered; -import org.eclipse.internal.net4j.util.event.Event; - /** * @author Eike Stepper */ diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/AbstractDelegator.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/AbstractDelegator.java index d14b68168c..ecd40231b4 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/AbstractDelegator.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/AbstractDelegator.java @@ -8,16 +8,15 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.util.container.delegate; +package org.eclipse.net4j.internal.util.container.delegate; +import org.eclipse.net4j.internal.util.container.ContainerEvent; +import org.eclipse.net4j.internal.util.container.SingleDeltaContainerEvent; +import org.eclipse.net4j.internal.util.event.Notifier; import org.eclipse.net4j.util.container.IContainer; import org.eclipse.net4j.util.container.IContainerDelta; import org.eclipse.net4j.util.container.IContainerDelta.Kind; -import org.eclipse.internal.net4j.util.container.ContainerEvent; -import org.eclipse.internal.net4j.util.container.SingleDeltaContainerEvent; -import org.eclipse.internal.net4j.util.event.Notifier; - import java.util.Collection; import java.util.Iterator; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/ContainerBlockingQueue.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerBlockingQueue.java index 8d2264e67b..4b185c4fc7 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/ContainerBlockingQueue.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerBlockingQueue.java @@ -8,13 +8,12 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.util.container.delegate; +package org.eclipse.net4j.internal.util.container.delegate; +import org.eclipse.net4j.internal.util.container.ContainerEvent; import org.eclipse.net4j.util.container.IContainerDelta; import org.eclipse.net4j.util.container.delegate.IContainerBlockingQueue; -import org.eclipse.internal.net4j.util.container.ContainerEvent; - import java.util.Collection; import java.util.concurrent.BlockingQueue; import java.util.concurrent.TimeUnit; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/ContainerCollection.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerCollection.java index 3666b774c3..c06461bc27 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/ContainerCollection.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerCollection.java @@ -8,13 +8,12 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.util.container.delegate; +package org.eclipse.net4j.internal.util.container.delegate; +import org.eclipse.net4j.internal.util.container.ContainerEvent; import org.eclipse.net4j.util.container.IContainerDelta; import org.eclipse.net4j.util.container.delegate.IContainerCollection; -import org.eclipse.internal.net4j.util.container.ContainerEvent; - import java.util.Collection; import java.util.Iterator; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/ContainerList.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerList.java index 1371d98b54..6953264e98 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/ContainerList.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerList.java @@ -8,13 +8,12 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.util.container.delegate; +package org.eclipse.net4j.internal.util.container.delegate; +import org.eclipse.net4j.internal.util.container.ContainerEvent; import org.eclipse.net4j.util.container.IContainerDelta; import org.eclipse.net4j.util.container.delegate.IContainerList; -import org.eclipse.internal.net4j.util.container.ContainerEvent; - import java.util.Collection; import java.util.List; import java.util.ListIterator; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/ContainerMap.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerMap.java index c5c7e03294..a9601af16b 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/ContainerMap.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerMap.java @@ -8,13 +8,12 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.util.container.delegate; +package org.eclipse.net4j.internal.util.container.delegate; +import org.eclipse.net4j.internal.util.container.ContainerEvent; import org.eclipse.net4j.util.container.IContainerDelta; import org.eclipse.net4j.util.container.delegate.IContainerMap; -import org.eclipse.internal.net4j.util.container.ContainerEvent; - import java.util.Collection; import java.util.Iterator; import java.util.Map; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/ContainerQueue.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerQueue.java index 5a9bc0c9b9..9535cb1ee0 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/ContainerQueue.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerQueue.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.util.container.delegate; +package org.eclipse.net4j.internal.util.container.delegate; import org.eclipse.net4j.util.container.delegate.IContainerQueue; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/ContainerSet.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerSet.java index 375cfa27cb..85a07e6957 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/ContainerSet.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerSet.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.util.container.delegate; +package org.eclipse.net4j.internal.util.container.delegate; import org.eclipse.net4j.util.container.delegate.IContainerSet; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/ContainerSortedSet.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerSortedSet.java index af8b4e27da..c3f650d9fc 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/ContainerSortedSet.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerSortedSet.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.util.container.delegate; +package org.eclipse.net4j.internal.util.container.delegate; import org.eclipse.net4j.util.container.delegate.IContainerSortedSet; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/event/Event.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/event/Event.java index de3aad6315..79de59c58f 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/event/Event.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/event/Event.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.util.event; +package org.eclipse.net4j.internal.util.event; import org.eclipse.net4j.util.event.IEvent; import org.eclipse.net4j.util.event.INotifier; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/event/Notifier.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/event/Notifier.java index 5e33f4b233..f375ad0762 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/event/Notifier.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/event/Notifier.java @@ -8,14 +8,13 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.util.event; +package org.eclipse.net4j.internal.util.event; +import org.eclipse.net4j.internal.util.bundle.OM; 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.bundle.Net4j; - import java.util.ArrayList; import java.util.List; @@ -64,7 +63,7 @@ public class Notifier implements INotifier.Introspection } catch (Exception ex) { - Net4j.LOG.error(ex); + OM.LOG.error(ex); } } } diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/factory/Factory.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/Factory.java index 02c7ce3041..ba43b17ee9 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/factory/Factory.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/Factory.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.util.factory; +package org.eclipse.net4j.internal.util.factory; import org.eclipse.net4j.util.factory.IFactory; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/factory/FactoryCreationException.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/FactoryCreationException.java index edbf9c6f50..ea8fdeba6d 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/factory/FactoryCreationException.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/FactoryCreationException.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.util.factory; +package org.eclipse.net4j.internal.util.factory; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/factory/FactoryDescriptor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/FactoryDescriptor.java index a149261889..2fa067d65e 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/factory/FactoryDescriptor.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/FactoryDescriptor.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.util.factory; +package org.eclipse.net4j.internal.util.factory; import org.eclipse.net4j.util.factory.IFactory; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/factory/FactoryKey.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/FactoryKey.java index f0247aeac7..75fe02cee1 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/factory/FactoryKey.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/FactoryKey.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.util.factory; +package org.eclipse.net4j.internal.util.factory; import org.eclipse.net4j.util.ObjectUtil; import org.eclipse.net4j.util.StringUtil; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/factory/PluginFactoryRegistry.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/PluginFactoryRegistry.java index 3de63b5ec6..420ac83799 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/factory/PluginFactoryRegistry.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/PluginFactoryRegistry.java @@ -8,8 +8,10 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.util.factory; +package org.eclipse.net4j.internal.util.factory; +import org.eclipse.net4j.internal.util.bundle.OM; +import org.eclipse.net4j.internal.util.registry.HashMapRegistry; import org.eclipse.net4j.util.factory.IFactory; import org.eclipse.net4j.util.factory.IFactoryKey; @@ -19,15 +21,13 @@ import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.core.runtime.IRegistryChangeEvent; import org.eclipse.core.runtime.IRegistryChangeListener; import org.eclipse.core.runtime.Platform; -import org.eclipse.internal.net4j.bundle.Net4j; -import org.eclipse.internal.net4j.util.registry.HashMapRegistry; /** * @author Eike Stepper */ public class PluginFactoryRegistry extends HashMapRegistry<IFactoryKey, IFactory> { - public static final String NAMESPACE = Net4j.BUNDLE_ID; + public static final String NAMESPACE = OM.BUNDLE_ID; public static final String EXT_POINT = "factories"; @@ -39,7 +39,7 @@ public class PluginFactoryRegistry extends HashMapRegistry<IFactoryKey, IFactory for (IExtensionDelta delta : deltas) { // TODO Handle ExtensionDelta - Net4j.LOG.warn("ExtensionDelta not handled: " + delta); + OM.LOG.warn("ExtensionDelta not handled: " + delta); } } }; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/lifecycle/Lifecycle.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/lifecycle/Lifecycle.java index 2f9f28ebe9..8638db1966 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/lifecycle/Lifecycle.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/lifecycle/Lifecycle.java @@ -8,16 +8,15 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.util.lifecycle; +package org.eclipse.net4j.internal.util.lifecycle; +import org.eclipse.net4j.internal.util.bundle.OM; +import org.eclipse.net4j.internal.util.event.Notifier; import org.eclipse.net4j.util.ReflectUtil; import org.eclipse.net4j.util.lifecycle.ILifecycle; import org.eclipse.net4j.util.lifecycle.ILifecycleEvent; import org.eclipse.net4j.util.om.trace.ContextTracer; -import org.eclipse.internal.net4j.bundle.Net4j; -import org.eclipse.internal.net4j.util.event.Notifier; - /** * @author Eike Stepper */ @@ -25,9 +24,9 @@ public class Lifecycle extends Notifier implements ILifecycle { public static boolean USE_LABEL = true; - private static final ContextTracer TRACER = new ContextTracer(Net4j.DEBUG_LIFECYCLE, Lifecycle.class); + private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_LIFECYCLE, Lifecycle.class); - private static final ContextTracer DUMPER = new ContextTracer(Net4j.DEBUG_LIFECYCLE_DUMP, Lifecycle.class); + private static final ContextTracer DUMPER = new ContextTracer(OM.DEBUG_LIFECYCLE_DUMP, Lifecycle.class); private boolean active; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/lifecycle/LifecycleEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/lifecycle/LifecycleEvent.java index 626ca8c6d2..a8a865993b 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/lifecycle/LifecycleEvent.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/lifecycle/LifecycleEvent.java @@ -8,13 +8,12 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.util.lifecycle; +package org.eclipse.net4j.internal.util.lifecycle; +import org.eclipse.net4j.internal.util.event.Event; import org.eclipse.net4j.util.lifecycle.ILifecycle; import org.eclipse.net4j.util.lifecycle.ILifecycleEvent; -import org.eclipse.internal.net4j.util.event.Event; - /** * @author Eike Stepper */ diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/lifecycle/LifecycleEventAdapter.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/lifecycle/LifecycleEventAdapter.java index 58354e10a9..e9ac5e5e69 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/lifecycle/LifecycleEventAdapter.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/lifecycle/LifecycleEventAdapter.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.util.lifecycle; +package org.eclipse.net4j.internal.util.lifecycle; import org.eclipse.net4j.util.event.IEvent; import org.eclipse.net4j.util.event.IListener; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/lifecycle/QueueWorker.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/lifecycle/QueueWorker.java index 5fbe04eb4f..b788d46a2a 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/lifecycle/QueueWorker.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/lifecycle/QueueWorker.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.util.lifecycle; +package org.eclipse.net4j.internal.util.lifecycle; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/lifecycle/Worker.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/lifecycle/Worker.java index 9fcfd44586..6b5e78005e 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/lifecycle/Worker.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/lifecycle/Worker.java @@ -8,9 +8,9 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.util.lifecycle; +package org.eclipse.net4j.internal.util.lifecycle; -import org.eclipse.internal.net4j.bundle.Net4j; +import org.eclipse.net4j.internal.util.bundle.OM; /** * @author Eike Stepper @@ -115,7 +115,7 @@ public abstract class Worker extends Lifecycle } catch (Exception ex) { - Net4j.LOG.error(ex); + OM.LOG.error(ex); break; } } diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/om/OSGiActivator.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/OSGiActivator.java index 2d5d2b3fc8..d51787820e 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/om/OSGiActivator.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/OSGiActivator.java @@ -8,12 +8,11 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.util.om; +package org.eclipse.net4j.internal.util.om; +import org.eclipse.net4j.internal.util.bundle.OM; import org.eclipse.net4j.util.om.OMBundle; -import org.eclipse.internal.net4j.bundle.Net4j; - import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; @@ -31,7 +30,7 @@ public abstract class OSGiActivator implements BundleActivator try { getOMBundle().setBundleContext(context); - Net4j.Activator.traceStart(context); + OM.Activator.traceStart(context); start(); } catch (Error error) @@ -50,7 +49,7 @@ public abstract class OSGiActivator implements BundleActivator { try { - Net4j.Activator.traceStop(context); + OM.Activator.traceStop(context); stop(); getOMBundle().setBundleContext(null); } diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/registry/DelegatingRegistry.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/DelegatingRegistry.java index 0ae78c87f8..f9e4aa76f1 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/registry/DelegatingRegistry.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/DelegatingRegistry.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.util.registry; +package org.eclipse.net4j.internal.util.registry; import org.eclipse.net4j.util.registry.IRegistry; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/registry/HashMapDelegatingRegistry.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/HashMapDelegatingRegistry.java index 7f73cc0a3a..e8c8968d5c 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/registry/HashMapDelegatingRegistry.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/HashMapDelegatingRegistry.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.util.registry; +package org.eclipse.net4j.internal.util.registry; import org.eclipse.net4j.util.registry.IRegistry; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/registry/HashMapRegistry.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/HashMapRegistry.java index fb9a194dfd..22aca730bd 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/registry/HashMapRegistry.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/HashMapRegistry.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.util.registry; +package org.eclipse.net4j.internal.util.registry; import java.util.HashMap; import java.util.Map; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/registry/Registry.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/Registry.java index e616f51c35..3342476a22 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/registry/Registry.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/Registry.java @@ -8,14 +8,13 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.util.registry; +package org.eclipse.net4j.internal.util.registry; +import org.eclipse.net4j.internal.util.bundle.OM; +import org.eclipse.net4j.internal.util.lifecycle.Lifecycle; import org.eclipse.net4j.util.container.IContainerDelta; import org.eclipse.net4j.util.registry.IRegistry; -import org.eclipse.internal.net4j.bundle.Net4j; -import org.eclipse.internal.net4j.util.lifecycle.Lifecycle; - import java.util.Collection; import java.util.Iterator; import java.util.Map; @@ -159,7 +158,7 @@ public abstract class Registry<K, V> extends Lifecycle implements IRegistry<K, V { if (!transaction.isOwned()) { - Net4j.LOG.warn("Committing thread is not owner of transaction: " + Thread.currentThread()); + OM.LOG.warn("Committing thread is not owner of transaction: " + Thread.currentThread()); } transaction.commit(notifications); diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/registry/RegistryEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/RegistryEvent.java index 6c2e957514..20409edd94 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/registry/RegistryEvent.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/RegistryEvent.java @@ -8,13 +8,12 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.util.registry; +package org.eclipse.net4j.internal.util.registry; +import org.eclipse.net4j.internal.util.container.ContainerEvent; import org.eclipse.net4j.util.registry.IRegistry; import org.eclipse.net4j.util.registry.IRegistryEvent; -import org.eclipse.internal.net4j.util.container.ContainerEvent; - import java.util.Map; /** diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/registry/RegistryEventAdapter.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/RegistryEventAdapter.java index f24d2218bc..2e39583bee 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/registry/RegistryEventAdapter.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/RegistryEventAdapter.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.util.registry; +package org.eclipse.net4j.internal.util.registry; import org.eclipse.net4j.util.container.IContainerEventVisitor; import org.eclipse.net4j.util.event.IEvent; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/registry/UnmodifiableRegistry.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/UnmodifiableRegistry.java index 0636d129f7..c4791c5ccb 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/registry/UnmodifiableRegistry.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/UnmodifiableRegistry.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.util.registry; +package org.eclipse.net4j.internal.util.registry; import org.eclipse.net4j.util.event.IListener; import org.eclipse.net4j.util.registry.IRegistry; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/HexUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/HexUtil.java index cac31b33b2..cac31b33b2 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/HexUtil.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/HexUtil.java diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/IOUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/IOUtil.java index 3bcb136ee9..13f2f280ef 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/IOUtil.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/IOUtil.java @@ -12,10 +12,7 @@ package org.eclipse.net4j.util; import java.io.Closeable; import java.io.InputStream; -import java.io.OutputStream; import java.io.PrintStream; -import java.io.Reader; -import java.io.Writer; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/ObjectUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ObjectUtil.java index 0875d85678..0875d85678 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/ObjectUtil.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ObjectUtil.java diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/ReflectUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ReflectUtil.java index 64ba04c23a..c888b616bf 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/ReflectUtil.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ReflectUtil.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.util; -import org.eclipse.internal.net4j.util.lifecycle.Lifecycle; +import org.eclipse.net4j.internal.util.lifecycle.Lifecycle; import java.io.PrintStream; import java.lang.annotation.ElementType; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/StringUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/StringUtil.java index 34199b79ed..34199b79ed 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/StringUtil.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/StringUtil.java diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/concurrent/ICorrelator.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/ICorrelator.java index 10cfd60e0f..10cfd60e0f 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/concurrent/ICorrelator.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/ICorrelator.java diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/concurrent/ISynchronizer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/ISynchronizer.java index 8a12bd8516..8a12bd8516 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/concurrent/ISynchronizer.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/ISynchronizer.java diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/concurrent/IWorkSerializer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/IWorkSerializer.java index 4cbeff2b8f..4cbeff2b8f 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/concurrent/IWorkSerializer.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/IWorkSerializer.java diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/concurrent/NonBlockingLongCounter.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/NonBlockingLongCounter.java index 1f58036730..1f58036730 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/concurrent/NonBlockingLongCounter.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/NonBlockingLongCounter.java diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/concurrent/package.html b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/package.html index 6c40a57b61..6c40a57b61 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/concurrent/package.html +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/package.html diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/ContainerUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerUtil.java index 60010f23db..60010f23db 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/ContainerUtil.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerUtil.java diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/IContainer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainer.java index f7f5b494ea..f7f5b494ea 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/IContainer.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainer.java diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/IContainerDelta.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainerDelta.java index 01498fb0b8..01498fb0b8 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/IContainerDelta.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainerDelta.java diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/IContainerEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainerEvent.java index 00db4fe335..00db4fe335 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/IContainerEvent.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainerEvent.java diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/IContainerEventVisitor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainerEventVisitor.java index 613b483302..613b483302 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/IContainerEventVisitor.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IContainerEventVisitor.java diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/IElementProcessor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IElementProcessor.java index 5afd965ba6..5afd965ba6 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/IElementProcessor.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IElementProcessor.java diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/IManagedContainer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IManagedContainer.java index 0e2fb87faf..e8f99a7283 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/IManagedContainer.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IManagedContainer.java @@ -10,12 +10,11 @@ **************************************************************************/ package org.eclipse.net4j.util.container; +import org.eclipse.net4j.internal.util.container.ManagedContainer; import org.eclipse.net4j.util.factory.IFactory; import org.eclipse.net4j.util.factory.IFactoryKey; import org.eclipse.net4j.util.registry.IRegistry; -import org.eclipse.internal.net4j.util.container.ManagedContainer; - import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/delegate/IContainerBlockingQueue.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerBlockingQueue.java index dbdca37541..dbdca37541 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/delegate/IContainerBlockingQueue.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerBlockingQueue.java diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/delegate/IContainerCollection.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerCollection.java index a0c1a6db2f..a0c1a6db2f 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/delegate/IContainerCollection.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerCollection.java diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/delegate/IContainerList.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerList.java index b1bb757393..b1bb757393 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/delegate/IContainerList.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerList.java diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/delegate/IContainerMap.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerMap.java index 95a4142280..95a4142280 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/delegate/IContainerMap.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerMap.java diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/delegate/IContainerQueue.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerQueue.java index 8bfbfd5b2a..8bfbfd5b2a 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/delegate/IContainerQueue.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerQueue.java diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/delegate/IContainerSet.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerSet.java index cdbc220e27..cdbc220e27 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/delegate/IContainerSet.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerSet.java diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/delegate/IContainerSortedSet.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerSortedSet.java index f5ec69cd89..f5ec69cd89 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/delegate/IContainerSortedSet.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/delegate/IContainerSortedSet.java diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/event/EventUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/EventUtil.java index 83f42a2896..83f42a2896 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/event/EventUtil.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/EventUtil.java diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/event/IEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/IEvent.java index 35e93df6bb..35e93df6bb 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/event/IEvent.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/IEvent.java diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/event/IListener.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/IListener.java index 55a979d49d..55a979d49d 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/event/IListener.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/IListener.java diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/event/INotifier.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/INotifier.java index d45dcb9f19..d45dcb9f19 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/event/INotifier.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/event/INotifier.java diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/factory/IFactory.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/IFactory.java index 24f564e6e3..24f564e6e3 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/factory/IFactory.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/IFactory.java diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/factory/IFactoryKey.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/IFactoryKey.java index f47b8b83c1..f47b8b83c1 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/factory/IFactoryKey.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/IFactoryKey.java diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/factory/ProductCreationException.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/ProductCreationException.java index 51ab7b10cb..51ab7b10cb 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/factory/ProductCreationException.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/ProductCreationException.java diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/lifecycle/ILifecycle.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/ILifecycle.java index 677b292059..677b292059 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/lifecycle/ILifecycle.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/ILifecycle.java diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/lifecycle/ILifecycleEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/ILifecycleEvent.java index 918f1a5a13..918f1a5a13 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/lifecycle/ILifecycleEvent.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/ILifecycleEvent.java diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/lifecycle/LifecycleException.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleException.java index 693a65cb8c..693a65cb8c 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/lifecycle/LifecycleException.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleException.java diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/lifecycle/LifecycleUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleUtil.java index fcda37275d..ca53837c0a 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/lifecycle/LifecycleUtil.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleUtil.java @@ -10,11 +10,10 @@ **************************************************************************/ package org.eclipse.net4j.util.lifecycle; +import org.eclipse.net4j.internal.util.bundle.OM; +import org.eclipse.net4j.internal.util.lifecycle.Lifecycle; import org.eclipse.net4j.util.om.trace.ContextTracer; -import org.eclipse.internal.net4j.bundle.Net4j; -import org.eclipse.internal.net4j.util.lifecycle.Lifecycle; - import java.lang.annotation.Annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -27,7 +26,7 @@ import java.lang.reflect.Method; */ public final class LifecycleUtil { - private static final ContextTracer TRACER = new ContextTracer(Net4j.DEBUG_LIFECYCLE, LifecycleUtil.class); + private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_LIFECYCLE, LifecycleUtil.class); private LifecycleUtil() { diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/lifecycle/package.html b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/package.html index 06815b380a..06815b380a 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/lifecycle/package.html +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/package.html diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/OMBundle.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMBundle.java index 367d7627ea..367d7627ea 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/OMBundle.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMBundle.java diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/OMLogHandler.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMLogHandler.java index 452643ff39..452643ff39 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/OMLogHandler.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMLogHandler.java diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/OMLogger.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMLogger.java index 7453263321..7453263321 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/OMLogger.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMLogger.java diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/OMPlatform.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMPlatform.java index eaa2120b9d..9fe07b6e1b 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/OMPlatform.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMPlatform.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.util.om; -import org.eclipse.internal.net4j.bundle.AbstractOMPlatform; +import org.eclipse.net4j.internal.util.bundle.AbstractOMPlatform; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/OMTraceHandler.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMTraceHandler.java index 5d61774488..5d61774488 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/OMTraceHandler.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMTraceHandler.java diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/OMTracer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMTracer.java index 1b5a7ae7d0..1b5a7ae7d0 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/OMTracer.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMTracer.java diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/log/EclipseLoggingBridge.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/log/EclipseLoggingBridge.java index a499a609f5..aa7aca35c4 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/log/EclipseLoggingBridge.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/log/EclipseLoggingBridge.java @@ -10,6 +10,8 @@ **************************************************************************/ package org.eclipse.net4j.util.om.log; +import org.eclipse.net4j.internal.util.bundle.OM; +import org.eclipse.net4j.internal.util.bundle.OSGiBundle; import org.eclipse.net4j.util.om.OMLogHandler; import org.eclipse.net4j.util.om.OMLogger; import org.eclipse.net4j.util.om.OMLogger.Level; @@ -19,8 +21,6 @@ import org.eclipse.core.runtime.ILog; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; -import org.eclipse.internal.net4j.bundle.Net4j; -import org.eclipse.internal.net4j.bundle.OSGiBundle; /** * @author Eike Stepper @@ -32,7 +32,7 @@ public class EclipseLoggingBridge implements OMLogHandler */ public static final EclipseLoggingBridge INSTANCE = new EclipseLoggingBridge(); - private static final ContextTracer TRACER = new ContextTracer(Net4j.DEBUG_OM, EclipseLoggingBridge.class); + private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_OM, EclipseLoggingBridge.class); protected EclipseLoggingBridge() { diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/log/OSGiLoggingBridge.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/log/OSGiLoggingBridge.java index e080f8a818..4b5a669ac3 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/log/OSGiLoggingBridge.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/log/OSGiLoggingBridge.java @@ -10,14 +10,13 @@ **************************************************************************/ package org.eclipse.net4j.util.om.log; +import org.eclipse.net4j.internal.util.bundle.OM; +import org.eclipse.net4j.internal.util.bundle.OSGiBundle; import org.eclipse.net4j.util.om.OMLogHandler; import org.eclipse.net4j.util.om.OMLogger; import org.eclipse.net4j.util.om.OMLogger.Level; import org.eclipse.net4j.util.om.trace.ContextTracer; -import org.eclipse.internal.net4j.bundle.Net4j; -import org.eclipse.internal.net4j.bundle.OSGiBundle; - import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; import org.osgi.service.log.LogService; @@ -30,7 +29,7 @@ public class OSGiLoggingBridge implements OMLogHandler // @Singleton public static final OSGiLoggingBridge INSTANCE = new OSGiLoggingBridge(); - private static final ContextTracer TRACER = new ContextTracer(Net4j.DEBUG_OM, OSGiLoggingBridge.class); + private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_OM, OSGiLoggingBridge.class); protected OSGiLoggingBridge() { diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/log/PrintLogHandler.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/log/PrintLogHandler.java index 6387ea4b96..6387ea4b96 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/log/PrintLogHandler.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/log/PrintLogHandler.java diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/package.html b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/package.html index 8ce0bef978..8ce0bef978 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/package.html +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/package.html diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/ContextTracer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/ContextTracer.java index 7f9b9e2649..7f9b9e2649 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/ContextTracer.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/ContextTracer.java diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/PrintTraceHandler.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/PrintTraceHandler.java index 93daa0238a..93daa0238a 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/PrintTraceHandler.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/PrintTraceHandler.java diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/RemoteTraceHandler.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/RemoteTraceHandler.java index 3246eb5e0b..3246eb5e0b 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/RemoteTraceHandler.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/RemoteTraceHandler.java diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/RemoteTraceServer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/RemoteTraceServer.java index 095aa6e5e7..095aa6e5e7 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/RemoteTraceServer.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/RemoteTraceServer.java diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/package.html b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/package.html index 019886f757..019886f757 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/package.html +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/package.html diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/IRegistry.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/IRegistry.java index 6466d8ec3c..6466d8ec3c 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/IRegistry.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/IRegistry.java diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/IRegistryEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/IRegistryEvent.java index 8ca5d023b9..8ca5d023b9 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/IRegistryEvent.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/IRegistryEvent.java diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/RegistryUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/RegistryUtil.java index 17dd73ec7f..19db421990 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/RegistryUtil.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/RegistryUtil.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.util.registry; -import org.eclipse.internal.net4j.util.registry.UnmodifiableRegistry; +import org.eclipse.net4j.internal.util.registry.UnmodifiableRegistry; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/package.html b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/package.html index 6ae2c99b32..6ae2c99b32 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/package.html +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/package.html diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/stream/ExtendedDataInput.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/stream/ExtendedDataInput.java index 0756e82224..0756e82224 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/stream/ExtendedDataInput.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/stream/ExtendedDataInput.java diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/stream/ExtendedDataInputStream.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/stream/ExtendedDataInputStream.java index 1e581ce8db..1e581ce8db 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/stream/ExtendedDataInputStream.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/stream/ExtendedDataInputStream.java diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/stream/ExtendedDataOutput.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/stream/ExtendedDataOutput.java index b310e09a11..b310e09a11 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/stream/ExtendedDataOutput.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/stream/ExtendedDataOutput.java diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/stream/ExtendedDataOutputStream.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/stream/ExtendedDataOutputStream.java index bca0b17a14..bca0b17a14 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/stream/ExtendedDataOutputStream.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/stream/ExtendedDataOutputStream.java diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/stream/package.html b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/stream/package.html index fa9ab6f46e..fa9ab6f46e 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/stream/package.html +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/stream/package.html diff --git a/plugins/org.eclipse.net4j/.options b/plugins/org.eclipse.net4j/.options index d4803f3631..abb711d899 100644 --- a/plugins/org.eclipse.net4j/.options +++ b/plugins/org.eclipse.net4j/.options @@ -1,11 +1,5 @@ org.eclipse.net4j/debug = true -org.eclipse.net4j/debug.lifecycle = true -org.eclipse.net4j/debug.lifecycle.dump = true -org.eclipse.net4j/debug.concurrency = true -org.eclipse.net4j/debug.registry = true -org.eclipse.net4j/debug.om = true - org.eclipse.net4j/debug.buffer = true org.eclipse.net4j/debug.buffer.stream = false org.eclipse.net4j/debug.channel = true diff --git a/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF index 980aaf6f48..9cba0c5bf8 100644 --- a/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF @@ -5,41 +5,13 @@ Bundle-Version: 0.8.0.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-Activator: org.eclipse.internal.net4j.bundle.Net4j$Activator +Bundle-Activator: org.eclipse.internal.net4j.bundle.OM$Activator Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Require-Bundle: org.eclipse.core.runtime;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.internal.net4j.bundle;version="0.8.0", - org.eclipse.internal.net4j.transport;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.container;version="0.8.0", - org.eclipse.internal.net4j.util.container.delegate;version="0.8.0", - org.eclipse.internal.net4j.util.event;version="0.8.0", - org.eclipse.internal.net4j.util.factory;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", +Require-Bundle: org.eclipse.core.runtime;resolution:=optional, + org.eclipse.net4j.util;visibility:=reexport +Export-Package: org.eclipse.internal.net4j;version="0.8.0", + org.eclipse.internal.net4j.bundle;version="0.8.0", org.eclipse.net4j;version="0.8.0", - org.eclipse.net4j.message;version="0.8.0", - org.eclipse.net4j.remote;version="0.8.0", org.eclipse.net4j.signal;version="0.8.0", - org.eclipse.net4j.stream;version="0.8.0", - org.eclipse.net4j.transport;version="0.8.0", - org.eclipse.net4j.user;version="0.8.0", - org.eclipse.net4j.util;version="0.8.0", - org.eclipse.net4j.util.concurrent;version="0.8.0", - org.eclipse.net4j.util.container;version="0.8.0", - org.eclipse.net4j.util.container.delegate;version="0.8.0", - org.eclipse.net4j.util.event;version="0.8.0", - org.eclipse.net4j.util.factory;version="0.8.0", - org.eclipse.net4j.util.lifecycle;version="0.8.0", - org.eclipse.net4j.util.om;version="0.8.0", - org.eclipse.net4j.util.om.log;version="0.8.0", - org.eclipse.net4j.util.om.trace;version="0.8.0", - org.eclipse.net4j.util.registry;version="0.8.0", - org.eclipse.net4j.util.stream;version="0.8.0" + org.eclipse.net4j.stream;version="0.8.0" Eclipse-LazyStart: true diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/Acceptor.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Acceptor.java index e22a25da78..89bf2c56c8 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/Acceptor.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Acceptor.java @@ -8,12 +8,15 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.transport; - -import org.eclipse.net4j.transport.IAcceptor; -import org.eclipse.net4j.transport.IAcceptorEvent; -import org.eclipse.net4j.transport.IBufferProvider; -import org.eclipse.net4j.transport.IConnector; +package org.eclipse.internal.net4j; + +import org.eclipse.net4j.IAcceptor; +import org.eclipse.net4j.IAcceptorEvent; +import org.eclipse.net4j.IBufferProvider; +import org.eclipse.net4j.IConnector; +import org.eclipse.net4j.internal.util.container.LifecycleEventConverter; +import org.eclipse.net4j.internal.util.container.SingleDeltaContainerEvent; +import org.eclipse.net4j.internal.util.lifecycle.Lifecycle; import org.eclipse.net4j.util.container.IContainer; import org.eclipse.net4j.util.container.IContainerDelta; import org.eclipse.net4j.util.container.IContainerEvent; @@ -25,10 +28,7 @@ import org.eclipse.net4j.util.lifecycle.LifecycleUtil; import org.eclipse.net4j.util.om.trace.ContextTracer; import org.eclipse.net4j.util.registry.IRegistry; -import org.eclipse.internal.net4j.bundle.Net4j; -import org.eclipse.internal.net4j.util.container.LifecycleEventConverter; -import org.eclipse.internal.net4j.util.container.SingleDeltaContainerEvent; -import org.eclipse.internal.net4j.util.lifecycle.Lifecycle; +import org.eclipse.internal.net4j.bundle.OM; import java.util.HashSet; import java.util.Set; @@ -39,7 +39,7 @@ import java.util.concurrent.ExecutorService; */ public abstract class Acceptor extends Lifecycle implements IAcceptor { - private static final ContextTracer TRACER = new ContextTracer(Net4j.DEBUG_ACCEPTOR, Acceptor.class); + private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_ACCEPTOR, Acceptor.class); private IBufferProvider bufferProvider; @@ -149,7 +149,7 @@ public abstract class Acceptor extends Lifecycle implements IAcceptor } catch (Exception ex) { - Net4j.LOG.error(ex); + OM.LOG.error(ex); } } diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/AcceptorFactory.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/AcceptorFactory.java index 1841aad2e2..a322c6dca0 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/AcceptorFactory.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/AcceptorFactory.java @@ -8,19 +8,19 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.transport; +package org.eclipse.internal.net4j; -import org.eclipse.net4j.transport.IAcceptor; +import org.eclipse.net4j.IAcceptor; +import org.eclipse.net4j.internal.util.factory.Factory; -import org.eclipse.internal.net4j.bundle.Net4j; -import org.eclipse.internal.net4j.util.factory.Factory; +import org.eclipse.internal.net4j.bundle.OM; /** * @author Eike Stepper */ public abstract class AcceptorFactory<PRODUCT extends IAcceptor> extends Factory<PRODUCT> { - public static final String ACCEPTOR_GROUP = Net4j.BUNDLE_ID + ".acceptors"; + public static final String ACCEPTOR_GROUP = OM.BUNDLE_ID + ".acceptors"; public AcceptorFactory(String type) { diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/Buffer.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Buffer.java index df50333a7a..183fc1d220 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/Buffer.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Buffer.java @@ -8,16 +8,16 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.transport; +package org.eclipse.internal.net4j; -import org.eclipse.net4j.transport.BufferState; -import org.eclipse.net4j.transport.IBuffer; -import org.eclipse.net4j.transport.IBufferProvider; +import org.eclipse.net4j.BufferState; +import org.eclipse.net4j.IBuffer; +import org.eclipse.net4j.IBufferProvider; import org.eclipse.net4j.util.HexUtil; import org.eclipse.net4j.util.ReflectUtil; import org.eclipse.net4j.util.om.trace.ContextTracer; -import org.eclipse.internal.net4j.bundle.Net4j; +import org.eclipse.internal.net4j.bundle.OM; import java.io.IOException; import java.nio.ByteBuffer; @@ -33,7 +33,7 @@ public class Buffer implements IBuffer private static final int EOS_OFFSET = 1; - private static final ContextTracer TRACER = new ContextTracer(Net4j.DEBUG_BUFFER, Buffer.class); + private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_BUFFER, Buffer.class); private static final String NL = System.getProperty("line.separator"); //$NON-NLS-1$ diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferFactory.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/BufferFactory.java index d977e0b7a0..d12963b568 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferFactory.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/BufferFactory.java @@ -8,12 +8,12 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.transport; +package org.eclipse.internal.net4j; -import org.eclipse.net4j.transport.IBuffer; +import org.eclipse.net4j.IBuffer; import org.eclipse.net4j.util.om.trace.ContextTracer; -import org.eclipse.internal.net4j.bundle.Net4j; +import org.eclipse.internal.net4j.bundle.OM; import java.text.MessageFormat; @@ -22,7 +22,7 @@ import java.text.MessageFormat; */ public class BufferFactory extends BufferProvider { - private static final ContextTracer TRACER = new ContextTracer(Net4j.DEBUG_BUFFER, BufferFactory.class); + private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_BUFFER, BufferFactory.class); public BufferFactory(short bufferCapacity) { diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferPool.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/BufferPool.java index f97339a3e5..6c2cbad2eb 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferPool.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/BufferPool.java @@ -8,15 +8,15 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.transport; +package org.eclipse.internal.net4j; -import org.eclipse.net4j.transport.IBuffer; -import org.eclipse.net4j.transport.IBufferPool; -import org.eclipse.net4j.transport.IBufferProvider; +import org.eclipse.net4j.IBuffer; +import org.eclipse.net4j.IBufferPool; +import org.eclipse.net4j.IBufferProvider; import org.eclipse.net4j.util.ReflectUtil.ExcludeFromDump; import org.eclipse.net4j.util.om.trace.ContextTracer; -import org.eclipse.internal.net4j.bundle.Net4j; +import org.eclipse.internal.net4j.bundle.OM; import java.lang.ref.ReferenceQueue; import java.lang.ref.SoftReference; @@ -29,7 +29,7 @@ import java.util.concurrent.ConcurrentLinkedQueue; */ public class BufferPool extends BufferProvider implements IBufferPool, IBufferPool.Introspection { - private static final ContextTracer TRACER = new ContextTracer(Net4j.DEBUG_BUFFER, BufferPool.class); + private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_BUFFER, BufferPool.class); private final IBufferProvider provider; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferProvider.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/BufferProvider.java index 160d445d98..b74029aafb 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferProvider.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/BufferProvider.java @@ -8,12 +8,11 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.transport; +package org.eclipse.internal.net4j; -import org.eclipse.net4j.transport.IBuffer; -import org.eclipse.net4j.transport.IBufferProvider; - -import org.eclipse.internal.net4j.util.lifecycle.Lifecycle; +import org.eclipse.net4j.IBuffer; +import org.eclipse.net4j.IBufferProvider; +import org.eclipse.net4j.internal.util.lifecycle.Lifecycle; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferUtil.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/BufferUtil.java index e64ad1a5c0..77c028e7f0 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferUtil.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/BufferUtil.java @@ -8,9 +8,9 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.transport; +package org.eclipse.internal.net4j; -import org.eclipse.net4j.transport.IBufferProvider; +import org.eclipse.net4j.IBufferProvider; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/Channel.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Channel.java index b971b25c59..616246705b 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/Channel.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Channel.java @@ -8,24 +8,24 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.transport; - -import org.eclipse.net4j.transport.BufferState; -import org.eclipse.net4j.transport.IBuffer; -import org.eclipse.net4j.transport.IBufferHandler; -import org.eclipse.net4j.transport.IBufferProvider; -import org.eclipse.net4j.transport.IChannel; -import org.eclipse.net4j.transport.IChannelID; -import org.eclipse.net4j.transport.IConnector; +package org.eclipse.internal.net4j; + +import org.eclipse.net4j.BufferState; +import org.eclipse.net4j.IBuffer; +import org.eclipse.net4j.IBufferHandler; +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; import org.eclipse.net4j.util.ObjectUtil; import org.eclipse.net4j.util.concurrent.IWorkSerializer; import org.eclipse.net4j.util.om.trace.ContextTracer; -import org.eclipse.internal.net4j.bundle.Net4j; -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.Lifecycle; +import org.eclipse.internal.net4j.bundle.OM; import java.text.MessageFormat; import java.util.Queue; @@ -37,7 +37,7 @@ import java.util.concurrent.ExecutorService; */ public class Channel extends Lifecycle implements IChannel, IBufferProvider { - private static final ContextTracer TRACER = new ContextTracer(Net4j.DEBUG_CHANNEL, Channel.class); + private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_CHANNEL, Channel.class); private short channelIndex = Buffer.NO_CHANNEL; @@ -146,7 +146,7 @@ public class Channel extends Lifecycle implements IChannel, IBufferProvider BufferState state = ((Buffer)buffer).getState(); if (state != BufferState.PUTTING) { - Net4j.LOG.warn("Ignoring buffer in state == " + state + ": " + this); //$NON-NLS-1$ //$NON-NLS-2$ + OM.LOG.warn("Ignoring buffer in state == " + state + ": " + this); //$NON-NLS-1$ //$NON-NLS-2$ return; } @@ -175,7 +175,7 @@ public class Channel extends Lifecycle implements IChannel, IBufferProvider { if (receiveHandler == null) { - Net4j.LOG.warn("Ignoring buffer because receiveHandler == null: " + this); //$NON-NLS-1$ + OM.LOG.warn("Ignoring buffer because receiveHandler == null: " + this); //$NON-NLS-1$ buffer.release(); return; } diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/ClientProtocolFactory.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/ClientProtocolFactory.java index f13ea1791c..76395cdb7c 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/ClientProtocolFactory.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/ClientProtocolFactory.java @@ -8,19 +8,19 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.transport; +package org.eclipse.internal.net4j; -import org.eclipse.net4j.transport.IProtocol; +import org.eclipse.net4j.IProtocol; +import org.eclipse.net4j.internal.util.factory.Factory; -import org.eclipse.internal.net4j.bundle.Net4j; -import org.eclipse.internal.net4j.util.factory.Factory; +import org.eclipse.internal.net4j.bundle.OM; /** * @author Eike Stepper */ public abstract class ClientProtocolFactory<PRODUCT extends IProtocol> extends Factory<PRODUCT> { - public static final String CLIENT_PROTOCOL_GROUP = Net4j.BUNDLE_ID + ".clientProtocols"; + public static final String CLIENT_PROTOCOL_GROUP = OM.BUNDLE_ID + ".clientProtocols"; public ClientProtocolFactory(String type) { diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/Connector.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Connector.java index 29e5f31f6d..3dc27c028b 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/Connector.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Connector.java @@ -8,19 +8,24 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.transport; - -import org.eclipse.net4j.transport.ConnectorException; -import org.eclipse.net4j.transport.ConnectorLocation; -import org.eclipse.net4j.transport.ConnectorState; -import org.eclipse.net4j.transport.IBuffer; -import org.eclipse.net4j.transport.IBufferProvider; -import org.eclipse.net4j.transport.IChannel; -import org.eclipse.net4j.transport.IConnector; -import org.eclipse.net4j.transport.IConnectorChannelsEvent; -import org.eclipse.net4j.transport.IConnectorCredentials; -import org.eclipse.net4j.transport.IConnectorStateEvent; -import org.eclipse.net4j.transport.IProtocol; +package org.eclipse.internal.net4j; + +import org.eclipse.net4j.ConnectorException; +import org.eclipse.net4j.ConnectorLocation; +import org.eclipse.net4j.ConnectorState; +import org.eclipse.net4j.IBuffer; +import org.eclipse.net4j.IBufferProvider; +import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.IConnector; +import org.eclipse.net4j.IConnectorChannelsEvent; +import org.eclipse.net4j.IConnectorCredentials; +import org.eclipse.net4j.IConnectorStateEvent; +import org.eclipse.net4j.IProtocol; +import org.eclipse.net4j.internal.util.container.LifecycleEventConverter; +import org.eclipse.net4j.internal.util.container.SingleDeltaContainerEvent; +import org.eclipse.net4j.internal.util.event.Event; +import org.eclipse.net4j.internal.util.factory.FactoryKey; +import org.eclipse.net4j.internal.util.lifecycle.Lifecycle; import org.eclipse.net4j.util.StringUtil; import org.eclipse.net4j.util.container.IContainer; import org.eclipse.net4j.util.container.IContainerDelta; @@ -34,12 +39,7 @@ import org.eclipse.net4j.util.lifecycle.LifecycleUtil; import org.eclipse.net4j.util.om.trace.ContextTracer; import org.eclipse.net4j.util.registry.IRegistry; -import org.eclipse.internal.net4j.bundle.Net4j; -import org.eclipse.internal.net4j.util.container.LifecycleEventConverter; -import org.eclipse.internal.net4j.util.container.SingleDeltaContainerEvent; -import org.eclipse.internal.net4j.util.event.Event; -import org.eclipse.internal.net4j.util.factory.FactoryKey; -import org.eclipse.internal.net4j.util.lifecycle.Lifecycle; +import org.eclipse.internal.net4j.bundle.OM; import java.util.ArrayList; import java.util.List; @@ -53,7 +53,7 @@ import java.util.concurrent.TimeUnit; */ public abstract class Connector extends Lifecycle implements IConnector { - private static final ContextTracer TRACER = new ContextTracer(Net4j.DEBUG_CONNECTOR, Connector.class); + private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_CONNECTOR, Connector.class); private String userID; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/ConnectorCredentials.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/ConnectorCredentials.java index a1c8e908fe..7edb50b4cd 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/ConnectorCredentials.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/ConnectorCredentials.java @@ -8,9 +8,9 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.transport; +package org.eclipse.internal.net4j; -import org.eclipse.net4j.transport.IConnectorCredentials; +import org.eclipse.net4j.IConnectorCredentials; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/ConnectorFactory.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/ConnectorFactory.java index adebfc1fd4..26bea5fe24 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/ConnectorFactory.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/ConnectorFactory.java @@ -8,19 +8,19 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.transport; +package org.eclipse.internal.net4j; -import org.eclipse.net4j.transport.IConnector; +import org.eclipse.net4j.IConnector; +import org.eclipse.net4j.internal.util.factory.Factory; -import org.eclipse.internal.net4j.bundle.Net4j; -import org.eclipse.internal.net4j.util.factory.Factory; +import org.eclipse.internal.net4j.bundle.OM; /** * @author Eike Stepper */ public abstract class ConnectorFactory<PRODUCT extends IConnector> extends Factory<PRODUCT> { - public static final String CONNECTOR_GROUP = Net4j.BUNDLE_ID + ".connectors"; + public static final String CONNECTOR_GROUP = OM.BUNDLE_ID + ".connectors"; public ConnectorFactory(String type) { diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/DescriptionUtil.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/DescriptionUtil.java index 0168bc5012..98ce151fc8 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/DescriptionUtil.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/DescriptionUtil.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.transport; +package org.eclipse.internal.net4j; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/Protocol.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Protocol.java index 112cfa8b3d..802c7e7fbf 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/Protocol.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Protocol.java @@ -8,14 +8,13 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.transport; +package org.eclipse.internal.net4j; -import org.eclipse.net4j.transport.IBuffer; -import org.eclipse.net4j.transport.IBufferProvider; -import org.eclipse.net4j.transport.IChannel; -import org.eclipse.net4j.transport.IProtocol; - -import org.eclipse.internal.net4j.util.lifecycle.Lifecycle; +import org.eclipse.net4j.IBuffer; +import org.eclipse.net4j.IBufferProvider; +import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.IProtocol; +import org.eclipse.net4j.internal.util.lifecycle.Lifecycle; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/ServerProtocolFactory.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/ServerProtocolFactory.java index cb22a75761..40c100cd73 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/ServerProtocolFactory.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/ServerProtocolFactory.java @@ -8,19 +8,19 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.transport; +package org.eclipse.internal.net4j; -import org.eclipse.net4j.transport.IProtocol; +import org.eclipse.net4j.IProtocol; +import org.eclipse.net4j.internal.util.factory.Factory; -import org.eclipse.internal.net4j.bundle.Net4j; -import org.eclipse.internal.net4j.util.factory.Factory; +import org.eclipse.internal.net4j.bundle.OM; /** * @author Eike Stepper */ public abstract class ServerProtocolFactory<PRODUCT extends IProtocol> extends Factory<PRODUCT> { - public static final String SERVER_PROTOCOL_GROUP = Net4j.BUNDLE_ID + ".serverProtocols"; + public static final String SERVER_PROTOCOL_GROUP = OM.BUNDLE_ID + ".serverProtocols"; public ServerProtocolFactory(String type) { diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/TransportContainer.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/TransportContainer.java index 1450f71672..18595f1317 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/TransportContainer.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/TransportContainer.java @@ -8,17 +8,16 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.internal.net4j.transport; +package org.eclipse.internal.net4j; -import org.eclipse.net4j.transport.IBufferProvider; -import org.eclipse.net4j.transport.ITransportContainer; -import org.eclipse.net4j.transport.TransportUtil; +import org.eclipse.net4j.IBufferProvider; +import org.eclipse.net4j.ITransportContainer; +import org.eclipse.net4j.TransportUtil; +import org.eclipse.net4j.internal.util.concurrent.NamedExecutorService; +import org.eclipse.net4j.internal.util.container.ManagedContainer; import org.eclipse.net4j.util.container.IElementProcessor; import org.eclipse.net4j.util.container.IManagedContainer; -import org.eclipse.internal.net4j.util.concurrent.NamedExecutorService; -import org.eclipse.internal.net4j.util.container.ManagedContainer; - import java.text.MessageFormat; import java.util.concurrent.ExecutorService; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OM.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OM.java new file mode 100644 index 0000000000..2b5a5bbdc4 --- /dev/null +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OM.java @@ -0,0 +1,70 @@ +/*************************************************************************** + * 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.bundle; + +import org.eclipse.net4j.internal.util.om.OSGiActivator; +import org.eclipse.net4j.util.om.OMBundle; +import org.eclipse.net4j.util.om.OMLogger; +import org.eclipse.net4j.util.om.OMPlatform; +import org.eclipse.net4j.util.om.OMTracer; + +/** + * @author Eike Stepper + */ +public final class OM +{ + public static final String BUNDLE_ID = "org.eclipse.net4j"; //$NON-NLS-1$ + + public static final OMBundle BUNDLE = OMPlatform.INSTANCE.bundle(BUNDLE_ID, OM.class); + + public static final OMTracer DEBUG = BUNDLE.tracer("debug"); //$NON-NLS-1$ + + public static final OMTracer DEBUG_BUFFER = DEBUG.tracer("buffer"); //$NON-NLS-1$ + + public static final OMTracer DEBUG_BUFFER_STREAM = DEBUG_BUFFER.tracer("stream"); //$NON-NLS-1$ + + public static final OMTracer DEBUG_CHANNEL = DEBUG.tracer("channel"); //$NON-NLS-1$ + + public static final OMTracer DEBUG_SELECTOR = DEBUG.tracer("selector"); //$NON-NLS-1$ + + public static final OMTracer DEBUG_ACCEPTOR = DEBUG.tracer("acceptor"); //$NON-NLS-1$ + + public static final OMTracer DEBUG_CONNECTOR = DEBUG.tracer("connector"); //$NON-NLS-1$ + + public static final OMTracer DEBUG_SIGNAL = DEBUG.tracer("signal"); //$NON-NLS-1$ + + public static final OMTracer PERF = BUNDLE.tracer("perf"); //$NON-NLS-1$ + + public static final OMLogger LOG = BUNDLE.logger(); + + private OM() + { + } + + /** + * @author Eike Stepper + */ + public static final class Activator extends OSGiActivator + { + @Override + protected OMBundle getOMBundle() + { + return BUNDLE; + } + + @Override + protected void stop() throws Exception + { + PluginTransportContainer.dispose(); + super.stop(); + } + } +} diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/PluginTransportContainer.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/PluginTransportContainer.java index 309e753622..77b3facb0c 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/PluginTransportContainer.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/PluginTransportContainer.java @@ -10,15 +10,15 @@ **************************************************************************/ package org.eclipse.internal.net4j.bundle; -import org.eclipse.net4j.transport.IPluginTransportContainer; +import org.eclipse.net4j.IPluginTransportContainer; +import org.eclipse.net4j.internal.util.container.PluginElementProcessorList; +import org.eclipse.net4j.internal.util.factory.PluginFactoryRegistry; import org.eclipse.net4j.util.container.IElementProcessor; import org.eclipse.net4j.util.factory.IFactory; import org.eclipse.net4j.util.factory.IFactoryKey; import org.eclipse.net4j.util.registry.IRegistry; -import org.eclipse.internal.net4j.transport.TransportContainer; -import org.eclipse.internal.net4j.util.container.PluginElementProcessorList; -import org.eclipse.internal.net4j.util.factory.PluginFactoryRegistry; +import org.eclipse.internal.net4j.TransportContainer; import java.util.List; @@ -66,7 +66,7 @@ public class PluginTransportContainer extends TransportContainer implements IPlu } catch (Exception ex) { - Net4j.LOG.error(ex); + OM.LOG.error(ex); instance = null; } } diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/BufferState.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/BufferState.java index e4f3898d81..ce68f9d58b 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/BufferState.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/BufferState.java @@ -8,7 +8,14 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.net4j.transport; +package org.eclipse.net4j; + +import static org.eclipse.net4j.BufferState.GETTING; +import static org.eclipse.net4j.BufferState.INITIAL; +import static org.eclipse.net4j.BufferState.PUTTING; +import static org.eclipse.net4j.BufferState.READING_BODY; +import static org.eclipse.net4j.BufferState.READING_HEADER; +import static org.eclipse.net4j.BufferState.WRITING; import java.nio.ByteBuffer; import java.nio.channels.SocketChannel; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/ConnectorException.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorException.java index e974519b8b..06bdb24862 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/ConnectorException.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorException.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.net4j.transport; +package org.eclipse.net4j; /** * Thrown by an {@link IConnector} to indicate connection problems. diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/ConnectorLocation.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorLocation.java index 3904985194..ac24b42799 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/ConnectorLocation.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorLocation.java @@ -8,7 +8,10 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.net4j.transport; +package org.eclipse.net4j; + +import static org.eclipse.net4j.ConnectorLocation.CLIENT; +import static org.eclipse.net4j.ConnectorLocation.SERVER; /** * Enumerates the roles that an {@link IConnector} can play during the diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/ConnectorState.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorState.java index 9493acfa57..96f7136f3f 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/ConnectorState.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorState.java @@ -8,7 +8,12 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.net4j.transport; +package org.eclipse.net4j; + +import static org.eclipse.net4j.ConnectorState.CONNECTED; +import static org.eclipse.net4j.ConnectorState.CONNECTING; +import static org.eclipse.net4j.ConnectorState.DISCONNECTED; +import static org.eclipse.net4j.ConnectorState.NEGOTIATING; import org.eclipse.net4j.util.lifecycle.ILifecycle; import org.eclipse.net4j.util.lifecycle.LifecycleUtil; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IAcceptor.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IAcceptor.java index 460cd26ffc..473cc1bf44 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IAcceptor.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IAcceptor.java @@ -8,11 +8,11 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.net4j.transport; +package org.eclipse.net4j; import org.eclipse.net4j.util.container.IContainer; -import org.eclipse.internal.net4j.transport.Acceptor; +import org.eclipse.internal.net4j.Acceptor; /** * Accepts incoming connection requests from diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IAcceptorEvent.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IAcceptorEvent.java index fe4650069d..5fcc6cc064 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IAcceptorEvent.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IAcceptorEvent.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.net4j.transport; +package org.eclipse.net4j; import org.eclipse.net4j.util.container.IContainerDelta; import org.eclipse.net4j.util.container.IContainerEvent; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IBuffer.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBuffer.java index bcb7e2dd2d..d949de0c9a 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IBuffer.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBuffer.java @@ -8,9 +8,9 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.net4j.transport; +package org.eclipse.net4j; -import org.eclipse.internal.net4j.transport.Buffer; +import org.eclipse.internal.net4j.Buffer; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IBufferHandler.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferHandler.java index 21dc33a99e..8af14bee76 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IBufferHandler.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferHandler.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.net4j.transport; +package org.eclipse.net4j; /** * Provides clients with the ability to pass {@link IBuffer}s in for further diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IBufferPool.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferPool.java index 3c72b9066c..f99d54c457 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IBufferPool.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferPool.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.net4j.transport; +package org.eclipse.net4j; /** * Provides clients with the ability to obtain and retain pooled {@link IBuffer}s. diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IBufferProvider.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferProvider.java index f8e3ad823e..74859769d2 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IBufferProvider.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferProvider.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.net4j.transport; +package org.eclipse.net4j; /** * Provides clients with the ability to obtain and retain {@link IBuffer}s. diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IChannel.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IChannel.java index 6ec4a07260..d31354145c 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IChannel.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IChannel.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.net4j.transport; +package org.eclipse.net4j; import org.eclipse.net4j.util.event.INotifier; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IChannelID.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IChannelID.java index 339a27f5b8..73b93c2084 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IChannelID.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IChannelID.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.net4j.transport; +package org.eclipse.net4j; /** * An identifier of an {@link IChannel} that is unique among all channels of all diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IConnector.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnector.java index cd19a7063c..e70d9507d5 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IConnector.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnector.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.net4j.transport; +package org.eclipse.net4j; import org.eclipse.net4j.util.container.IContainer; import org.eclipse.net4j.util.event.IListener; @@ -17,8 +17,8 @@ import org.eclipse.net4j.util.factory.IFactoryKey; import org.eclipse.net4j.util.lifecycle.ILifecycle; import org.eclipse.net4j.util.registry.IRegistry; -import org.eclipse.internal.net4j.transport.Channel; -import org.eclipse.internal.net4j.transport.Connector; +import org.eclipse.internal.net4j.Channel; +import org.eclipse.internal.net4j.Connector; /** * One endpoint of a physical connection of arbitrary nature between two diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IConnectorChannelsEvent.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorChannelsEvent.java index 95e0b58045..24994133e7 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IConnectorChannelsEvent.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorChannelsEvent.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.net4j.transport; +package org.eclipse.net4j; import org.eclipse.net4j.util.container.IContainerDelta; import org.eclipse.net4j.util.container.IContainerEvent; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IConnectorCredentials.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorCredentials.java index d6ec1d7b9d..fc6a008a65 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IConnectorCredentials.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorCredentials.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.net4j.transport; +package org.eclipse.net4j; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IConnectorNegotiator.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorNegotiator.java index 6f49695b19..69564fc2ce 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IConnectorNegotiator.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorNegotiator.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.net4j.transport; +package org.eclipse.net4j; /** * Provides the ability to execute a negotitation phase between two connectors. diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IConnectorStateEvent.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorStateEvent.java index 024f2fa069..a9b1a7bdba 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IConnectorStateEvent.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorStateEvent.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.net4j.transport; +package org.eclipse.net4j; import org.eclipse.net4j.util.container.IContainerEvent; import org.eclipse.net4j.util.event.IEvent; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IPluginTransportContainer.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IPluginTransportContainer.java index dbc849d8a7..11b4b1703e 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IPluginTransportContainer.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IPluginTransportContainer.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.net4j.transport; +package org.eclipse.net4j; import org.eclipse.internal.net4j.bundle.PluginTransportContainer; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IProtocol.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IProtocol.java index 439bed21a5..ebbe9854e7 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IProtocol.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IProtocol.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.net4j.transport; +package org.eclipse.net4j; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/ITransportContainer.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ITransportContainer.java index 255f8a6f82..599fc1927c 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/ITransportContainer.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ITransportContainer.java @@ -8,11 +8,11 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.net4j.transport; +package org.eclipse.net4j; import org.eclipse.net4j.util.container.IManagedContainer; -import org.eclipse.internal.net4j.bundle.Net4j; +import org.eclipse.internal.net4j.bundle.OM; import java.util.concurrent.ExecutorService; @@ -22,9 +22,9 @@ import java.util.concurrent.ExecutorService; */ public interface ITransportContainer extends IManagedContainer { - public static final String EXECUTOR_SERVICE_GROUP = Net4j.BUNDLE_ID + ".executorServices"; + public static final String EXECUTOR_SERVICE_GROUP = OM.BUNDLE_ID + ".executorServices"; - public static final String BUFFER_PROVIDER_GROUP = Net4j.BUNDLE_ID + ".bufferProviders"; + public static final String BUFFER_PROVIDER_GROUP = OM.BUNDLE_ID + ".bufferProviders"; public static final short DEFAULT_BUFFER_CAPACITY = 4096; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/TransportUtil.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/TransportUtil.java index e37f9d878b..50876c3f18 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/TransportUtil.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/TransportUtil.java @@ -8,10 +8,10 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.net4j.transport; +package org.eclipse.net4j; -import org.eclipse.internal.net4j.transport.BufferFactory; -import org.eclipse.internal.net4j.transport.BufferPool; +import org.eclipse.internal.net4j.BufferFactory; +import org.eclipse.internal.net4j.BufferPool; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/doc-files/Acceptors.png b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/Acceptors.png Binary files differindex 60bdf17416..60bdf17416 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/doc-files/Acceptors.png +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/Acceptors.png diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/doc-files/BufferStates.old.png b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/BufferStates.old.png Binary files differindex be484f67d3..be484f67d3 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/doc-files/BufferStates.old.png +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/BufferStates.old.png diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/doc-files/BufferStates.png b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/BufferStates.png Binary files differindex c1a91bf1b1..c1a91bf1b1 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/doc-files/BufferStates.png +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/BufferStates.png diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/doc-files/Buffers.png b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/Buffers.png Binary files differindex 818b129951..818b129951 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/doc-files/Buffers.png +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/Buffers.png diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/doc-files/Channels.png b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/Channels.png Binary files differindex 4dc14775af..4dc14775af 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/doc-files/Channels.png +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/Channels.png diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/doc-files/CommunicationProcess.jpg b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/CommunicationProcess.jpg Binary files differindex 56fa6c2dae..56fa6c2dae 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/doc-files/CommunicationProcess.jpg +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/CommunicationProcess.jpg diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/doc-files/CommunicationProcess.uxf b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/CommunicationProcess.uxf index 6a92e29264..6a92e29264 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/doc-files/CommunicationProcess.uxf +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/CommunicationProcess.uxf diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/doc-files/ConnectionProcess.jpg b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/ConnectionProcess.jpg Binary files differindex 1cde3438b7..1cde3438b7 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/doc-files/ConnectionProcess.jpg +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/ConnectionProcess.jpg diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/doc-files/ConnectionProcess.uxf b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/ConnectionProcess.uxf index ac9b745a4f..ac9b745a4f 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/doc-files/ConnectionProcess.uxf +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/ConnectionProcess.uxf diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/doc-files/ConnectorStates.png b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/ConnectorStates.png Binary files differindex 238d1e6c0f..238d1e6c0f 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/doc-files/ConnectorStates.png +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/ConnectorStates.png diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/doc-files/Connectors.png b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/Connectors.png Binary files differindex 73066c3737..73066c3737 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/doc-files/Connectors.png +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/doc-files/Connectors.png diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/message/IMessageDeserializer.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/message/IMessageDeserializer.java deleted file mode 100644 index 63b59d962b..0000000000 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/message/IMessageDeserializer.java +++ /dev/null @@ -1,18 +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.message; - -/** - * @author Eike Stepper - */ -public interface IMessageDeserializer -{ -} diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/message/IMessageSerializer.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/message/IMessageSerializer.java deleted file mode 100644 index b1b89525f2..0000000000 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/message/IMessageSerializer.java +++ /dev/null @@ -1,18 +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.message; - -/** - * @author Eike Stepper - */ -public interface IMessageSerializer -{ -} diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/message/package.html b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/message/package.html deleted file mode 100644 index daa5fa3de1..0000000000 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/message/package.html +++ /dev/null @@ -1,44 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> -<html> -<head> -<!-- - - 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 - ---> -</head> -<body bgcolor="white"> - -A framework for publish/subscribe based communication on top of -the Net4j transport layer. -<p> - -<!-- - -<h2>Package Specification</h2> - -##### FILL IN ANY SPECS NEEDED BY JAVA COMPATIBILITY KIT ##### -<ul> - <li><a href="">##### REFER TO ANY FRAMEMAKER SPECIFICATION HERE #####</a> -</ul> - -<h2>Related Documentation</h2> - -For overviews, tutorials, examples, guides, and tool documentation, please see: -<ul> - <li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a> -</ul> - ---> - -<!-- Put @see and @since tags down here. --> - -</body> -</html> diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/package.html b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/package.html index 1e12bd6f2c..14b586ea86 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/package.html +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/package.html @@ -1,7 +1,6 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> <html> <head> -<title>Package Description</title> <!-- Copyright (c) 2004 - 2007 Eike Stepper, Germany. @@ -17,12 +16,27 @@ </head> <body bgcolor="white"> -The main package of the Net4j API. Contains sub packages for the different layers -of Net4j as well as a collection of {@link org.eclipse.net4j.util utility} packages and a -{@link org.eclipse.net4j.util.Net4jUtil factory} class for the creation various -instances of the transport layer interfaces. +The transport layer of the Net4j API. +The four main interfaces of the transport layer are +{@link org.eclipse.net4j.transport.IBuffer}, +{@link org.eclipse.net4j.transport.IChannel}, +{@link org.eclipse.net4j.transport.IConnector} and +{@link org.eclipse.net4j.transport.IProtocol}. <p> +<dt><b>Sequence Diagram: Communication Process</b></dt> +<dd> <img src="doc-files/CommunicationProcess.jpg" title="Communication Process" border="0" +usemap="#CommunicationProcess.jpg"/></dd> +<p> +<MAP NAME="CommunicationProcess.jpg"> +<AREA SHAPE="RECT" COORDS="128,94,247,123" HREF="IConnector.html"> +<AREA SHAPE="RECT" COORDS="648,95,767,123" HREF="IConnector.html"> +<AREA SHAPE="RECT" COORDS="509,254,608,283" HREF="IChannel.html"> +<AREA SHAPE="RECT" COORDS="287,355,387,383" HREF="IChannel.html"> +<AREA SHAPE="RECT" COORDS="818,195,897,222" HREF="IProtocol.html"> + +</MAP> + <!-- <h2>Package Specification</h2> diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/remote/.package.html b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/remote/.package.html deleted file mode 100644 index 7d44710d9d..0000000000 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/remote/.package.html +++ /dev/null @@ -1,45 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> -<html> -<head> -<title>Package Description</title> -<!-- - - 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 - ---> -</head> -<body bgcolor="white"> - -A framework for exporting and importing services on top of -the Net4j transport layer. -<p> - -<!-- - -<h2>Package Specification</h2> - -##### FILL IN ANY SPECS NEEDED BY JAVA COMPATIBILITY KIT ##### -<ul> - <li><a href="">##### REFER TO ANY FRAMEMAKER SPECIFICATION HERE #####</a> -</ul> - -<h2>Related Documentation</h2> - -For overviews, tutorials, examples, guides, and tool documentation, please see: -<ul> - <li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a> -</ul> - ---> - -<!-- Put @see and @since tags down here. --> - -</body> -</html> diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/remote/IServiceExporter.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/remote/IServiceExporter.java deleted file mode 100644 index 1eb61b66a0..0000000000 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/remote/IServiceExporter.java +++ /dev/null @@ -1,18 +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.remote; - -/** - * @author Eike Stepper - */ -public interface IServiceExporter -{ -} diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/remote/IServiceImporter.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/remote/IServiceImporter.java deleted file mode 100644 index fd247c4a59..0000000000 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/remote/IServiceImporter.java +++ /dev/null @@ -1,18 +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.remote; - -/** - * @author Eike Stepper - */ -public interface IServiceImporter -{ -} diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/remote/package.html b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/remote/package.html deleted file mode 100644 index 7d44710d9d..0000000000 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/remote/package.html +++ /dev/null @@ -1,45 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> -<html> -<head> -<title>Package Description</title> -<!-- - - 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 - ---> -</head> -<body bgcolor="white"> - -A framework for exporting and importing services on top of -the Net4j transport layer. -<p> - -<!-- - -<h2>Package Specification</h2> - -##### FILL IN ANY SPECS NEEDED BY JAVA COMPATIBILITY KIT ##### -<ul> - <li><a href="">##### REFER TO ANY FRAMEMAKER SPECIFICATION HERE #####</a> -</ul> - -<h2>Related Documentation</h2> - -For overviews, tutorials, examples, guides, and tool documentation, please see: -<ul> - <li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a> -</ul> - ---> - -<!-- Put @see and @since tags down here. --> - -</body> -</html> diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Indication.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Indication.java index a5e90e8b3b..347b4253d2 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Indication.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Indication.java @@ -16,7 +16,7 @@ import org.eclipse.net4j.util.ReflectUtil; import org.eclipse.net4j.util.om.trace.ContextTracer; import org.eclipse.net4j.util.stream.ExtendedDataInputStream; -import org.eclipse.internal.net4j.bundle.Net4j; +import org.eclipse.internal.net4j.bundle.OM; import java.io.IOException; @@ -25,7 +25,7 @@ import java.io.IOException; */ public abstract class Indication extends SignalReactor { - private static final ContextTracer TRACER = new ContextTracer(Net4j.DEBUG_SIGNAL, Indication.class); + private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_SIGNAL, Indication.class); protected Indication() { diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java index 0ce90b3ed5..e1bdf6b783 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java @@ -17,7 +17,7 @@ import org.eclipse.net4j.util.om.trace.ContextTracer; import org.eclipse.net4j.util.stream.ExtendedDataInputStream; import org.eclipse.net4j.util.stream.ExtendedDataOutputStream; -import org.eclipse.internal.net4j.bundle.Net4j; +import org.eclipse.internal.net4j.bundle.OM; import java.io.IOException; @@ -26,7 +26,7 @@ import java.io.IOException; */ public abstract class IndicationWithResponse extends SignalReactor { - private static final ContextTracer TRACER = new ContextTracer(Net4j.DEBUG_SIGNAL, IndicationWithResponse.class); + private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_SIGNAL, IndicationWithResponse.class); protected IndicationWithResponse() { diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Request.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Request.java index 2ab2579290..5afd73bdab 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Request.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Request.java @@ -10,14 +10,14 @@ **************************************************************************/ package org.eclipse.net4j.signal; +import org.eclipse.net4j.IChannel; import org.eclipse.net4j.stream.BufferInputStream; import org.eclipse.net4j.stream.BufferOutputStream; -import org.eclipse.net4j.transport.IChannel; import org.eclipse.net4j.util.ReflectUtil; import org.eclipse.net4j.util.om.trace.ContextTracer; import org.eclipse.net4j.util.stream.ExtendedDataOutputStream; -import org.eclipse.internal.net4j.bundle.Net4j; +import org.eclipse.internal.net4j.bundle.OM; import java.io.IOException; @@ -26,7 +26,7 @@ import java.io.IOException; */ public abstract class Request extends SignalActor { - private static final ContextTracer TRACER = new ContextTracer(Net4j.DEBUG_SIGNAL, Request.class); + private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_SIGNAL, Request.class); protected Request(IChannel channel) { diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RequestWithConfirmation.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RequestWithConfirmation.java index bb54fd8309..db71b50adc 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RequestWithConfirmation.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RequestWithConfirmation.java @@ -10,15 +10,15 @@ **************************************************************************/ package org.eclipse.net4j.signal; +import org.eclipse.net4j.IChannel; import org.eclipse.net4j.stream.BufferInputStream; import org.eclipse.net4j.stream.BufferOutputStream; -import org.eclipse.net4j.transport.IChannel; import org.eclipse.net4j.util.ReflectUtil; import org.eclipse.net4j.util.om.trace.ContextTracer; import org.eclipse.net4j.util.stream.ExtendedDataInputStream; import org.eclipse.net4j.util.stream.ExtendedDataOutputStream; -import org.eclipse.internal.net4j.bundle.Net4j; +import org.eclipse.internal.net4j.bundle.OM; import java.io.IOException; @@ -27,7 +27,7 @@ import java.io.IOException; */ public abstract class RequestWithConfirmation<RESULT> extends SignalActor<RESULT> { - private static final ContextTracer TRACER = new ContextTracer(Net4j.DEBUG_SIGNAL, RequestWithConfirmation.class); + private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_SIGNAL, RequestWithConfirmation.class); protected RequestWithConfirmation(IChannel channel) { diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Signal.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Signal.java index 898771fa1d..320b715d88 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Signal.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Signal.java @@ -14,7 +14,7 @@ import org.eclipse.net4j.stream.BufferInputStream; import org.eclipse.net4j.stream.BufferOutputStream; import org.eclipse.net4j.util.om.trace.ContextTracer; -import org.eclipse.internal.net4j.bundle.Net4j; +import org.eclipse.internal.net4j.bundle.OM; import java.io.EOFException; import java.util.concurrent.TimeoutException; @@ -24,7 +24,7 @@ import java.util.concurrent.TimeoutException; */ public abstract class Signal implements Runnable { - private static final ContextTracer TRACER = new ContextTracer(Net4j.DEBUG_SIGNAL, Signal.class); + private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_SIGNAL, Signal.class); private SignalProtocol protocol; @@ -66,7 +66,7 @@ public abstract class Signal implements Runnable } catch (Exception ex) { - Net4j.LOG.error(ex); + OM.LOG.error(ex); if (TRACER.isEnabled()) { TRACER.trace(ex); diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalActor.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalActor.java index 3869c45372..7134ae0ccb 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalActor.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalActor.java @@ -10,9 +10,9 @@ **************************************************************************/ package org.eclipse.net4j.signal; +import org.eclipse.net4j.IBufferHandler; +import org.eclipse.net4j.IChannel; import org.eclipse.net4j.stream.BufferInputStream; -import org.eclipse.net4j.transport.IBufferHandler; -import org.eclipse.net4j.transport.IChannel; import org.eclipse.net4j.util.ReflectUtil; /** diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java index 13059d492e..4d5eb8a01e 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java @@ -10,15 +10,15 @@ **************************************************************************/ package org.eclipse.net4j.signal; +import org.eclipse.net4j.IBuffer; +import org.eclipse.net4j.IBufferProvider; import org.eclipse.net4j.stream.BufferInputStream; import org.eclipse.net4j.stream.ChannelOutputStream; -import org.eclipse.net4j.transport.IBuffer; -import org.eclipse.net4j.transport.IBufferProvider; import org.eclipse.net4j.util.om.trace.ContextTracer; -import org.eclipse.internal.net4j.bundle.Net4j; -import org.eclipse.internal.net4j.transport.BufferUtil; -import org.eclipse.internal.net4j.transport.Protocol; +import org.eclipse.internal.net4j.BufferUtil; +import org.eclipse.internal.net4j.Protocol; +import org.eclipse.internal.net4j.bundle.OM; import java.nio.ByteBuffer; import java.text.MessageFormat; @@ -37,10 +37,9 @@ public abstract class SignalProtocol extends Protocol private static final int MAX_CORRELATION_ID = Integer.MAX_VALUE; - private static final ContextTracer TRACER = new ContextTracer(Net4j.DEBUG_SIGNAL, SignalProtocol.class); + private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_SIGNAL, SignalProtocol.class); - private static final ContextTracer STREAM_TRACER = new ContextTracer(Net4j.DEBUG_BUFFER_STREAM, - SignalOutputStream.class); + private static final ContextTracer STREAM_TRACER = new ContextTracer(OM.DEBUG_BUFFER_STREAM, SignalOutputStream.class); private Map<Integer, Signal> signals = new ConcurrentHashMap(0); diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/BufferInputStream.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/BufferInputStream.java index 41bdf26e7e..83c4038d4c 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/BufferInputStream.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/BufferInputStream.java @@ -10,12 +10,12 @@ **************************************************************************/ package org.eclipse.net4j.stream; -import org.eclipse.net4j.transport.IBuffer; -import org.eclipse.net4j.transport.IBufferHandler; +import org.eclipse.net4j.IBuffer; +import org.eclipse.net4j.IBufferHandler; import org.eclipse.net4j.util.HexUtil; import org.eclipse.net4j.util.om.trace.ContextTracer; -import org.eclipse.internal.net4j.bundle.Net4j; +import org.eclipse.internal.net4j.bundle.OM; import java.io.IOException; import java.io.InputStream; @@ -34,7 +34,7 @@ public class BufferInputStream extends InputStream implements IBufferHandler public static final long DEFAULT_MILLIS_INTERRUPT_CHECK = 100; - private static final ContextTracer TRACER = new ContextTracer(Net4j.DEBUG_BUFFER_STREAM, BufferInputStream.class); + private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_BUFFER_STREAM, BufferInputStream.class); private BlockingQueue<IBuffer> buffers = new LinkedBlockingQueue(); diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/BufferOutputStream.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/BufferOutputStream.java index 4c69182917..a43c635c97 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/BufferOutputStream.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/BufferOutputStream.java @@ -10,14 +10,14 @@ **************************************************************************/ package org.eclipse.net4j.stream; -import org.eclipse.net4j.transport.IBuffer; -import org.eclipse.net4j.transport.IBufferHandler; -import org.eclipse.net4j.transport.IBufferProvider; +import org.eclipse.net4j.IBuffer; +import org.eclipse.net4j.IBufferHandler; +import org.eclipse.net4j.IBufferProvider; import org.eclipse.net4j.util.HexUtil; import org.eclipse.net4j.util.lifecycle.LifecycleUtil; import org.eclipse.net4j.util.om.trace.ContextTracer; -import org.eclipse.internal.net4j.bundle.Net4j; +import org.eclipse.internal.net4j.bundle.OM; import java.io.IOException; import java.io.OutputStream; @@ -30,7 +30,7 @@ public class BufferOutputStream extends OutputStream { public static final boolean DEFAULT_PROPAGATE_CLOSE = false; - private static final ContextTracer TRACER = new ContextTracer(Net4j.DEBUG_BUFFER_STREAM, BufferOutputStream.class); + private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_BUFFER_STREAM, BufferOutputStream.class); private IBufferHandler bufferHandler; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/ChannelInputStream.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/ChannelInputStream.java index 0f2a4a8225..5a83b7bc98 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/ChannelInputStream.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/ChannelInputStream.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.stream; -import org.eclipse.net4j.transport.IChannel; +import org.eclipse.net4j.IChannel; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/ChannelOutputStream.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/ChannelOutputStream.java index 4d7a81c297..3900c39e73 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/ChannelOutputStream.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/ChannelOutputStream.java @@ -10,8 +10,8 @@ **************************************************************************/ package org.eclipse.net4j.stream; -import org.eclipse.net4j.transport.IBufferProvider; -import org.eclipse.net4j.transport.IChannel; +import org.eclipse.net4j.IBufferProvider; +import org.eclipse.net4j.IChannel; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/package.html b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/package.html deleted file mode 100644 index 14b586ea86..0000000000 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/package.html +++ /dev/null @@ -1,61 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> -<html> -<head> -<!-- - - 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 - ---> -</head> -<body bgcolor="white"> - -The transport layer of the Net4j API. -The four main interfaces of the transport layer are -{@link org.eclipse.net4j.transport.IBuffer}, -{@link org.eclipse.net4j.transport.IChannel}, -{@link org.eclipse.net4j.transport.IConnector} and -{@link org.eclipse.net4j.transport.IProtocol}. -<p> - -<dt><b>Sequence Diagram: Communication Process</b></dt> -<dd> <img src="doc-files/CommunicationProcess.jpg" title="Communication Process" border="0" -usemap="#CommunicationProcess.jpg"/></dd> -<p> -<MAP NAME="CommunicationProcess.jpg"> -<AREA SHAPE="RECT" COORDS="128,94,247,123" HREF="IConnector.html"> -<AREA SHAPE="RECT" COORDS="648,95,767,123" HREF="IConnector.html"> -<AREA SHAPE="RECT" COORDS="509,254,608,283" HREF="IChannel.html"> -<AREA SHAPE="RECT" COORDS="287,355,387,383" HREF="IChannel.html"> -<AREA SHAPE="RECT" COORDS="818,195,897,222" HREF="IProtocol.html"> - -</MAP> - -<!-- - -<h2>Package Specification</h2> - -##### FILL IN ANY SPECS NEEDED BY JAVA COMPATIBILITY KIT ##### -<ul> - <li><a href="">##### REFER TO ANY FRAMEMAKER SPECIFICATION HERE #####</a> -</ul> - -<h2>Related Documentation</h2> - -For overviews, tutorials, examples, guides, and tool documentation, please see: -<ul> - <li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a> -</ul> - ---> - -<!-- Put @see and @since tags down here. --> - -</body> -</html> diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/user/Credentials.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/user/Credentials.java deleted file mode 100644 index d3e589b172..0000000000 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/user/Credentials.java +++ /dev/null @@ -1,19 +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.user; - -/** - * @author Eike Stepper - */ -public interface Credentials -{ - public String getID(); -} diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/user/User.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/user/User.java deleted file mode 100644 index 8e08335ad3..0000000000 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/user/User.java +++ /dev/null @@ -1,19 +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.user; - -/** - * @author Eike Stepper - */ -public interface User -{ - public String getID(); -} |
