Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j')
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jSession.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jSessionConfiguration.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jUtil.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jViewProvider.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDOSession.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDOSessionConfiguration.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDOSessionRecoveryEvent.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/FailoverCDOSessionConfiguration.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/ReconnectingCDOSessionConfiguration.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/RecoveringCDOSessionConfiguration.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/package-info.java15
11 files changed, 25 insertions, 30 deletions
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jSession.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jSession.java
index f01d3512c3..57ee34cac8 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jSession.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jSession.java
@@ -20,7 +20,7 @@ import org.eclipse.emf.spi.cdo.CDOSessionProtocol;
/**
* A Net4j-specific CDO {@link CDOSession session}.
- *
+ *
* @since 4.1
* @author Eike Stepper
* @noextend This interface is not intended to be extended by clients.
@@ -37,7 +37,7 @@ public interface CDONet4jSession extends org.eclipse.emf.cdo.session.CDOSession
/**
* Encapsulates a set of notifying {@link CDONet4jSession session} configuration options.
- *
+ *
* @since 4.1
* @author Eike Stepper
* @noextend This interface is not intended to be extended by clients.
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jSessionConfiguration.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jSessionConfiguration.java
index 9c442165a1..4cf0031a72 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jSessionConfiguration.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jSessionConfiguration.java
@@ -20,7 +20,7 @@ import org.eclipse.net4j.util.io.IStreamWrapper;
/**
* Configures and opens new Net4j-specific CDO {@link CDOSession sessions}.
- *
+ *
* @since 4.1
* @author Eike Stepper
* @noextend This interface is not intended to be extended by clients.
@@ -59,7 +59,7 @@ public interface CDONet4jSessionConfiguration extends org.eclipse.emf.cdo.sessio
/**
* A special package registry can be set <b>before</b> the session is opened and can not be changed thereafter.
- *
+ *
* @see CDONet4jSession#getPackageRegistry()
*/
public void setPackageRegistry(CDOPackageRegistry packageRegistry);
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jUtil.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jUtil.java
index 499771eaea..b417d47eeb 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jUtil.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jUtil.java
@@ -161,8 +161,8 @@ public final class CDONet4jUtil
*/
public static CDONet4jSession getNet4jSession(IManagedContainer container, String description)
{
- return (CDONet4jSession)container
- .getElement(CDOSessionFactory.PRODUCT_GROUP, Net4jSessionFactory.TYPE, description);
+ return (CDONet4jSession)container.getElement(CDOSessionFactory.PRODUCT_GROUP, Net4jSessionFactory.TYPE,
+ description);
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jViewProvider.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jViewProvider.java
index 36164a62ee..c1757a08c0 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jViewProvider.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDONet4jViewProvider.java
@@ -186,8 +186,8 @@ public abstract class CDONet4jViewProvider extends AbstractCDOViewProvider
try
{
- credentialsProvider = (IPasswordCredentialsProvider)getContainer().getElement(
- "org.eclipse.net4j.util.credentialsProviders", "password", resource);
+ credentialsProvider = (IPasswordCredentialsProvider)getContainer()
+ .getElement("org.eclipse.net4j.util.credentialsProviders", "password", resource);
}
catch (FactoryNotFoundException ex)
{
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDOSession.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDOSession.java
index 5ae9fdfeb9..a02f877f3c 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDOSession.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDOSession.java
@@ -4,7 +4,7 @@
* 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
*/
@@ -16,7 +16,7 @@ import org.eclipse.emf.spi.cdo.CDOSessionProtocol;
/**
* Deprecated, use {@link org.eclipse.emf.cdo.net4j.CDONet4jSession CDONet4jSession}.
- *
+ *
* @since 2.0
* @author Eike Stepper
* @noextend This interface is not intended to be extended by clients.
@@ -28,7 +28,7 @@ public interface CDOSession extends CDONet4jSession
{
/**
* Returns the {@link Options options} of this session.
- *
+ *
* @deprecated Use {@link org.eclipse.emf.cdo.net4j.CDONet4jSession#options() CDONet4jSession.options()}.
*/
@Deprecated
@@ -36,7 +36,7 @@ public interface CDOSession extends CDONet4jSession
/**
* Deprecated, use {@link org.eclipse.emf.cdo.net4j.CDONet4jSession.Options CDONet4jSession.Options}.
- *
+ *
* @author Eike Stepper
* @noextend This interface is not intended to be extended by clients.
* @noimplement This interface is not intended to be implemented by clients.
@@ -48,7 +48,7 @@ public interface CDOSession extends CDONet4jSession
/**
* Returns the Net4j {@link CDOSessionProtocol protocol} instance that represents the underlying
* <em>signalling connection</em> to the repository of this session.
- *
+ *
* @see #getNet4jProtocol()
* @deprecated Kept for 4.0 compatibility. Newer code should call {@link #getNet4jProtocol()}.
*/
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDOSessionConfiguration.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDOSessionConfiguration.java
index 2aa1abb53f..5ffe23381a 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDOSessionConfiguration.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDOSessionConfiguration.java
@@ -4,7 +4,7 @@
* 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
*/
@@ -12,7 +12,7 @@ package org.eclipse.emf.cdo.net4j;
/**
* Deprecated, use {@link org.eclipse.emf.cdo.net4j.CDONet4jSessionConfiguration CDONet4jSessionConfiguration}.
- *
+ *
* @since 3.0
* @author Eike Stepper
* @noextend This interface is not intended to be extended by clients.
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDOSessionRecoveryEvent.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDOSessionRecoveryEvent.java
index 624f987da3..8fdf0d5af0 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDOSessionRecoveryEvent.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDOSessionRecoveryEvent.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.cdo.session.CDOSessionEvent;
/**
* A {@link CDOSessionEvent session event} fired from {@link RecoveringCDOSessionConfiguration recovering session} when
* recovery has started or finished.
- *
+ *
* @author Eike Stepper
* @since 4.0
* @noextend This interface is not intended to be extended by clients.
@@ -28,7 +28,7 @@ public interface CDOSessionRecoveryEvent extends CDOSessionEvent
/**
* Enumerates the possible types of {@link CDOSessionRecoveryEvent session recovery events}.
- *
+ *
* @author Eike Stepper
* @noextend This interface is not intended to be extended by clients.
*/
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/FailoverCDOSessionConfiguration.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/FailoverCDOSessionConfiguration.java
index 13074bfb4a..b05286352d 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/FailoverCDOSessionConfiguration.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/FailoverCDOSessionConfiguration.java
@@ -13,7 +13,7 @@ package org.eclipse.emf.cdo.net4j;
/**
* A {@link RecoveringCDOSessionConfiguration session configuration} that recovers from network problems by failing over
* to backup repositories as directed by a fail-over monitor.
- *
+ *
* @author Eike Stepper
* @since 4.0
* @noextend This interface is not intended to be extended by clients.
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/ReconnectingCDOSessionConfiguration.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/ReconnectingCDOSessionConfiguration.java
index 2efc9c8b23..5f4d6f8eae 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/ReconnectingCDOSessionConfiguration.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/ReconnectingCDOSessionConfiguration.java
@@ -13,7 +13,7 @@ package org.eclipse.emf.cdo.net4j;
/**
* A {@link RecoveringCDOSessionConfiguration session configuration} that recovers from network problems by attempting
* to reconnect to the same repository in specific intervals.
- *
+ *
* @author Caspar De Groot
* @since 4.0
* @noextend This interface is not intended to be extended by clients.
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/RecoveringCDOSessionConfiguration.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/RecoveringCDOSessionConfiguration.java
index 4fb64633d7..1a548d8040 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/RecoveringCDOSessionConfiguration.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/RecoveringCDOSessionConfiguration.java
@@ -15,7 +15,7 @@ import org.eclipse.net4j.signal.heartbeat.HeartBeatProtocol;
/**
* A {@link CDONet4jSessionConfiguration session configuration} that uses a {@link HeartBeatProtocol heart beat
* protocol} to detect network problems. Subtypes specify the exact behaviour to recover from these problems.
- *
+ *
* @author Caspar De Groot
* @since 4.0
* @noextend This interface is not intended to be extended by clients.
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/package-info.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/package-info.java
index e6b782912d..d9625b2c6e 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/package-info.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/package-info.java
@@ -1,19 +1,14 @@
/*
- * Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others.
- * 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 (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others. 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
*/
/**
* Client concepts for dealing with Net4j-based sessions to remote repositories.
- *
+ *
* @apiviz.exclude .*Event
* @apiviz.exclude .*Event\.Type
*/
package org.eclipse.emf.cdo.net4j;
-

Back to the top