diff options
6 files changed, 14 insertions, 23 deletions
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractOMBundle.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractOMBundle.java index 89e228bb35..8d259606bb 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractOMBundle.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractOMBundle.java @@ -182,12 +182,12 @@ public abstract class AbstractOMBundle implements OMBundle public File getConfigFile() { - return platform.getConfigFile(bundleID); + return platform.getConfigFile(getConfigFileName()); } public Properties getConfigProperties() { - return platform.getConfigProperties(bundleID); + return platform.getConfigProperties(getConfigFileName()); } public InputStream getInputStream(String path) throws IOException @@ -304,4 +304,9 @@ public abstract class AbstractOMBundle implements OMBundle { return new OMLoggerImpl(this); } + + protected String getConfigFileName() + { + return bundleID + ".properties"; + } } diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractOMPlatform.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractOMPlatform.java index e0048f1cce..ed471eeef5 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractOMPlatform.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractOMPlatform.java @@ -102,12 +102,7 @@ public abstract class AbstractOMPlatform implements OMPlatform public File getConfigFolder() { - String config = System.getProperty(SYSTEM_PROPERTY_NET4J_CONFIG); - if (config == null) - { - return null; - } - + String config = System.getProperty(SYSTEM_PROPERTY_NET4J_CONFIG, "config"); File configFolder = new File(config); if (!configFolder.exists()) { diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/NonBlockingLongCounter.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/NonBlockingLongCounter.java index 1f58036730..4d9c9f963c 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/NonBlockingLongCounter.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/NonBlockingLongCounter.java @@ -44,4 +44,10 @@ public final class NonBlockingLongCounter return v + 1; } + + @Override + public String toString() + { + return Long.toString(getValue()); + } } diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/BufferState.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/BufferState.java index ce68f9d58b..23a7e3b787 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/BufferState.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/BufferState.java @@ -10,13 +10,6 @@ **************************************************************************/ 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/ConnectorLocation.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorLocation.java index ac24b42799..306daea3b9 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorLocation.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorLocation.java @@ -10,9 +10,6 @@ **************************************************************************/ 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 * establishment of a physical connection. diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorState.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorState.java index 96f7136f3f..0eadde8dd4 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorState.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorState.java @@ -10,11 +10,6 @@ **************************************************************************/ 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; |