[Releng] Increase max line length to 160

7 files changed, 16 insertions, 29 deletions

diff --git a/plugins/org.eclipse.emf.cdo.examples/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.examples/.settings/org.eclipse.jdt.core.prefs
index 264e6b3acf..b61ffcacfa 100644
--- a/plugins/org.eclipse.emf.cdo.examples/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.examples/.settings/org.eclipse.jdt.core.prefs
@@ -366,7 +366,7 @@ org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
 org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
 org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.lineSplit=160
 org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
 org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
 org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
diff --git a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/StandaloneManualExample.java b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/StandaloneManualExample.java
index e1d72181ba..8b18200385 100644
--- a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/StandaloneManualExample.java
+++ b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/StandaloneManualExample.java
@@ -52,8 +52,7 @@ public class StandaloneManualExample
     IBufferProvider bufferProvider = Net4jUtil.createBufferPool();
     LifecycleUtil.activate(bufferProvider);
 
-    IProtocolProvider protocolProvider = new FactoriesProtocolProvider(
-        new org.eclipse.emf.cdo.internal.net4j.protocol.CDOClientProtocolFactory());
+    IProtocolProvider protocolProvider = new FactoriesProtocolProvider(new org.eclipse.emf.cdo.internal.net4j.protocol.CDOClientProtocolFactory());
 
     // Prepare selector
     org.eclipse.net4j.internal.tcp.TCPSelector selector = new org.eclipse.net4j.internal.tcp.TCPSelector();
diff --git a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/VariousExamples.java b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/VariousExamples.java
index 1324da2fa9..163af51d24 100644
--- a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/VariousExamples.java
+++ b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/VariousExamples.java
@@ -48,8 +48,7 @@ public class VariousExamples
 
   public static void registerSessionWithPluginContainer() throws CommitException
   {
-    CDONet4jSession session = (CDONet4jSession)IPluginContainer.INSTANCE.getElement("org.eclipse.emf.cdo.sessions",
-        "cdo", "tcp://repos.foo.org:2036/MyRepo");
+    CDONet4jSession session = (CDONet4jSession)IPluginContainer.INSTANCE.getElement("org.eclipse.emf.cdo.sessions", "cdo", "tcp://repos.foo.org:2036/MyRepo");
     CDOTransaction transaction = session.openTransaction();
     // ...
     transaction.commit();
diff --git a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/FailoverExample.java b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/FailoverExample.java
index 8f45e60d1d..21400a04f0 100644
--- a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/FailoverExample.java
+++ b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/FailoverExample.java
@@ -191,8 +191,7 @@ public abstract class FailoverExample
     else if ("3".equals(command))
     {
       System.out.println();
-      System.out.println(repository.getName() + ": " + repository.getType()
-          + (repository.getType() == Type.BACKUP ? "|" + repository.getState() : ""));
+      System.out.println(repository.getName() + ": " + repository.getType() + (repository.getType() == Type.BACKUP ? "|" + repository.getState() : ""));
     }
     else if ("0".equals(command))
     {
@@ -256,8 +255,7 @@ public abstract class FailoverExample
 
   protected IRepositorySynchronizer createRepositorySynchronizer(String peerHost, int peerPort, String repositoryName)
   {
-    CDOSessionConfigurationFactory factory = createSessionConfigurationFactory(peerHost + ":" + peerPort,
-        repositoryName);
+    CDOSessionConfigurationFactory factory = createSessionConfigurationFactory(peerHost + ":" + peerPort, repositoryName);
 
     IRepositorySynchronizer synchronizer = CDOServerUtil.createRepositorySynchronizer(factory);
     synchronizer.setRetryInterval(2);
@@ -266,8 +264,7 @@ public abstract class FailoverExample
     return synchronizer;
   }
 
-  protected CDOSessionConfigurationFactory createSessionConfigurationFactory(final String connectorDescription,
-      final String repositoryName)
+  protected CDOSessionConfigurationFactory createSessionConfigurationFactory(final String connectorDescription, final String repositoryName)
   {
     return new CDOSessionConfigurationFactory()
     {
@@ -316,8 +313,7 @@ public abstract class FailoverExample
     protected IRepository createRepository(IStore store, Map<String, String> props)
     {
       IRepositorySynchronizer synchronizer = createRepositorySynchronizer(peerHost, peerPort, peerRepository);
-      ISynchronizableRepository repository = CDOServerUtil.createFailoverParticipant(name, store, props, synchronizer,
-          master);
+      ISynchronizableRepository repository = CDOServerUtil.createFailoverParticipant(name, store, props, synchronizer, master);
       repository.setInitialPackages(CompanyPackage.eINSTANCE);
       return repository;
     }
@@ -438,8 +434,7 @@ public abstract class FailoverExample
       FailoverAgent agent = new FailoverAgent()
       {
         @Override
-        protected org.eclipse.emf.cdo.session.CDOSessionConfiguration createSessionConfiguration(
-            String connectorDescription, String repositoryName)
+        protected org.eclipse.emf.cdo.session.CDOSessionConfiguration createSessionConfiguration(String connectorDescription, String repositoryName)
         {
           return Monitored.this.createSessionConfiguration(connectorDescription, repositoryName);
         }
@@ -470,8 +465,7 @@ public abstract class FailoverExample
       public static void main(String[] args) throws Exception
       {
         IManagedContainer container = createContainer();
-        FailoverMonitor monitor = (FailoverMonitor)container.getElement(FailoverMonitor.PRODUCT_GROUP, "net4j",
-            REPOSITORY_GROUP);
+        FailoverMonitor monitor = (FailoverMonitor)container.getElement(FailoverMonitor.PRODUCT_GROUP, "net4j", REPOSITORY_GROUP);
 
         monitor.addListener(new ContainerEventAdapter<AgentProtocol>()
         {
@@ -554,8 +548,8 @@ public abstract class FailoverExample
       public static void main(String[] args) throws Exception
       {
         IManagedContainer container = createContainer();
-        CDONet4jSessionConfiguration configuration = CDONet4jUtil.createFailoverSessionConfiguration(
-            REPOSITORY_MONITOR_HOST + ":" + REPOSITORY_MONITOR_PORT, REPOSITORY_GROUP, container);
+        CDONet4jSessionConfiguration configuration = CDONet4jUtil.createFailoverSessionConfiguration(REPOSITORY_MONITOR_HOST + ":" + REPOSITORY_MONITOR_PORT,
+            REPOSITORY_GROUP, container);
 
         final CDONet4jSession session = configuration.openNet4jSession();
         System.out.println("Connected");
diff --git a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java
index 25b7a5b1e8..42b3475e22 100644
--- a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java
+++ b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java
@@ -180,8 +180,7 @@ public abstract class AbstractOfflineExampleServer
     else if ("3".equals(command))
     {
       System.out.println();
-      System.out.println(repository.getName() + ": " + repository.getType()
-          + (repository.getType() == Type.BACKUP ? "|" + repository.getState() : ""));
+      System.out.println(repository.getName() + ": " + repository.getType() + (repository.getType() == Type.BACKUP ? "|" + repository.getState() : ""));
     }
     else if ("0".equals(command))
     {
@@ -205,8 +204,7 @@ public abstract class AbstractOfflineExampleServer
 
   protected IAcceptor createAcceptor()
   {
-    return (IAcceptor)container.getElement("org.eclipse.net4j.acceptors", AbstractOfflineExampleServer.TRANSPORT_TYPE,
-        "0.0.0.0:" + port);
+    return (IAcceptor)container.getElement("org.eclipse.net4j.acceptors", AbstractOfflineExampleServer.TRANSPORT_TYPE, "0.0.0.0:" + port);
   }
 
   protected void disconnect()
diff --git a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClient.java b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClient.java
index 7faf4cc0e4..a433e6ff27 100644
--- a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClient.java
+++ b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClient.java
@@ -177,8 +177,7 @@ public class OfflineExampleClient
 
     System.out.println("Client starting...");
     IManagedContainer container = OfflineExampleUtil.createContainer();
-    IConnector connector = Net4jUtil.getConnector(container, AbstractOfflineExampleServer.TRANSPORT_TYPE,
-        "localhost:" + PORT);
+    IConnector connector = Net4jUtil.getConnector(container, AbstractOfflineExampleServer.TRANSPORT_TYPE, "localhost:" + PORT);
 
     CDONet4jSessionConfiguration configuration = CDONet4jUtil.createNet4jSessionConfiguration();
     configuration.setConnector(connector);
diff --git a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClone.java b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClone.java
index 4c20a676fd..f22befc593 100644
--- a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClone.java
+++ b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleClone.java
@@ -48,8 +48,7 @@ public class OfflineExampleClone extends AbstractOfflineExampleServer
   @Override
   protected IRepository createRepository(IStore store, Map<String, String> props)
   {
-    IRepositorySynchronizer synchronizer = createRepositorySynchronizer("localhost:" + OfflineExampleUtil.MASTER_PORT,
-        OfflineExampleUtil.MASTER_NAME);
+    IRepositorySynchronizer synchronizer = createRepositorySynchronizer("localhost:" + OfflineExampleUtil.MASTER_PORT, OfflineExampleUtil.MASTER_NAME);
     return CDOServerUtil.createOfflineClone(name, store, props, synchronizer);
   }
 
@@ -71,8 +70,7 @@ public class OfflineExampleClone extends AbstractOfflineExampleServer
    * creates a CDOSessionConfigurationFactory for the offline clone. It instantiates a connection to the master
    * repository.
    */
-  protected CDOSessionConfigurationFactory createSessionConfigurationFactory(final String connectorDescription,
-      final String repositoryName)
+  protected CDOSessionConfigurationFactory createSessionConfigurationFactory(final String connectorDescription, final String repositoryName)
   {
     return new CDOSessionConfigurationFactory()
     {