Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2016-10-18 15:30:55 +0000
committerEike Stepper2016-10-18 15:30:55 +0000
commitd271b313d58d5eef02ed687c151a42dfd0c0f0ed (patch)
tree57ca0c57f33f0780f6092613bab565d35f7986af /plugins/org.eclipse.net4j.buddies.server
parent6809f0af826be94b174d4e1a45d75e686813d267 (diff)
downloadcdo-d271b313d58d5eef02ed687c151a42dfd0c0f0ed.tar.gz
cdo-d271b313d58d5eef02ed687c151a42dfd0c0f0ed.tar.xz
cdo-d271b313d58d5eef02ed687c151a42dfd0c0f0ed.zip
[Releng] Increase max line length to 160
Diffstat (limited to 'plugins/org.eclipse.net4j.buddies.server')
-rw-r--r--plugins/org.eclipse.net4j.buddies.server/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--plugins/org.eclipse.net4j.buddies.server/META-INF/MANIFEST.MF12
-rw-r--r--plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/CollaborationInitiatedNotification.java3
3 files changed, 8 insertions, 9 deletions
diff --git a/plugins/org.eclipse.net4j.buddies.server/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.buddies.server/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.net4j.buddies.server/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.buddies.server/.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.net4j.buddies.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.buddies.server/META-INF/MANIFEST.MF
index 83d26b2cca..a6b07c1d8b 100644
--- a/plugins/org.eclipse.net4j.buddies.server/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.buddies.server/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.net4j.buddies.server;singleton:=true
-Bundle-Version: 4.0.500.qualifier
+Bundle-Version: 4.0.600.qualifier
Bundle-Vendor: %providerName
Bundle-Activator: org.eclipse.net4j.buddies.internal.server.bundle.OM$Activator
Bundle-ClassPath: .
@@ -10,9 +10,9 @@ Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
org.eclipse.net4j.buddies.common;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
-Export-Package: org.eclipse.net4j.buddies.internal.server;version="4.0.500";x-internal:=true,
- org.eclipse.net4j.buddies.internal.server.bundle;version="4.0.500";x-internal:=true,
- org.eclipse.net4j.buddies.internal.server.messages;version="4.0.500";x-internal:=true,
- org.eclipse.net4j.buddies.internal.server.protocol;version="4.0.500";x-internal:=true,
- org.eclipse.net4j.buddies.server;version="4.0.500"
+Export-Package: org.eclipse.net4j.buddies.internal.server;version="4.0.600";x-internal:=true,
+ org.eclipse.net4j.buddies.internal.server.bundle;version="4.0.600";x-internal:=true,
+ org.eclipse.net4j.buddies.internal.server.messages;version="4.0.600";x-internal:=true,
+ org.eclipse.net4j.buddies.internal.server.protocol;version="4.0.600";x-internal:=true,
+ org.eclipse.net4j.buddies.server;version="4.0.600"
Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/CollaborationInitiatedNotification.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/CollaborationInitiatedNotification.java
index e163b7c51a..da04842a4c 100644
--- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/CollaborationInitiatedNotification.java
+++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/CollaborationInitiatedNotification.java
@@ -32,8 +32,7 @@ public class CollaborationInitiatedNotification extends Request
/**
* @since 2.0
*/
- public CollaborationInitiatedNotification(BuddiesServerProtocol protocol, long collaborationID,
- Collection<IBuddy> buddies, String[] facilityTypes)
+ public CollaborationInitiatedNotification(BuddiesServerProtocol protocol, long collaborationID, Collection<IBuddy> buddies, String[] facilityTypes)
{
super(protocol, ProtocolConstants.SIGNAL_COLLABORATION_INITIATED);
this.collaborationID = collaborationID;

Back to the top