Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormkuppe2009-02-12 08:57:16 -0500
committermkuppe2009-02-12 08:57:16 -0500
commitb4177dcf91933abdee6ab18b14f5fea10d22a962 (patch)
tree906fe3315e45e0a009d4ff53f915be216b99767a /examples/bundles/org.eclipse.ecf.example.collab
parent5723fda6924a7b7ecd322dc58230bdeebbbf4f7e (diff)
downloadorg.eclipse.ecf-b4177dcf91933abdee6ab18b14f5fea10d22a962.tar.gz
org.eclipse.ecf-b4177dcf91933abdee6ab18b14f5fea10d22a962.tar.xz
org.eclipse.ecf-b4177dcf91933abdee6ab18b14f5fea10d22a962.zip
NEW - bug 264126: BREE should include Foundation 1.1 as much as possible
https://bugs.eclipse.org/bugs/show_bug.cgi?id=264126
Diffstat (limited to 'examples/bundles/org.eclipse.ecf.example.collab')
-rw-r--r--examples/bundles/org.eclipse.ecf.example.collab/.classpath4
-rw-r--r--examples/bundles/org.eclipse.ecf.example.collab/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--examples/bundles/org.eclipse.ecf.example.collab/META-INF/MANIFEST.MF3
-rw-r--r--examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/ui/ChatComposite.java3
4 files changed, 10 insertions, 9 deletions
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/.classpath b/examples/bundles/org.eclipse.ecf.example.collab/.classpath
index ce7393340..6f3b481ac 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/.classpath
+++ b/examples/bundles/org.eclipse.ecf.example.collab/.classpath
@@ -1,7 +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.4"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/CDC-1.1%Foundation-1.1"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/.settings/org.eclipse.jdt.core.prefs b/examples/bundles/org.eclipse.ecf.example.collab/.settings/org.eclipse.jdt.core.prefs
index 17eeefcdb..548f81993 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/.settings/org.eclipse.jdt.core.prefs
+++ b/examples/bundles/org.eclipse.ecf.example.collab/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,5 @@
-#Mon Sep 11 15:15:24 EDT 2006
+#Mon Feb 09 22:58:07 CET 2009
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.source=1.3
org.eclipse.jdt.core.builder.cleanOutputFolder=clean
org.eclipse.jdt.core.builder.duplicateResourceTask=warning
org.eclipse.jdt.core.builder.invalidClasspath=abort
@@ -11,7 +8,9 @@ org.eclipse.jdt.core.circularClasspath=error
org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.4
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -72,6 +71,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=en
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.3
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
@@ -143,7 +143,6 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.example.collab/META-INF/MANIFEST.MF
index b05f568a3..33aa75c78 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/META-INF/MANIFEST.MF
+++ b/examples/bundles/org.eclipse.ecf.example.collab/META-INF/MANIFEST.MF
@@ -15,7 +15,8 @@ Export-Package: org.eclipse.ecf.example.collab.share,
org.eclipse.ecf.internal.example.collab.ui.hyperlink;x-internal:=true
Eclipse-LazyStart: true
Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
+Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,
+ J2SE-1.4
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui,
org.eclipse.core.resources,
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/ui/ChatComposite.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/ui/ChatComposite.java
index d9fd33d84..451f71cf0 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/ui/ChatComposite.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/internal/example/collab/ui/ChatComposite.java
@@ -21,6 +21,7 @@ import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.ecf.core.identity.ID;
import org.eclipse.ecf.core.identity.IDFactory;
import org.eclipse.ecf.core.user.IUser;
+import org.eclipse.ecf.core.util.StringUtils;
import org.eclipse.ecf.example.collab.share.io.FileTransferParams;
import org.eclipse.ecf.internal.example.collab.ClientPlugin;
import org.eclipse.ecf.presence.IPresenceContainerAdapter;
@@ -1002,7 +1003,7 @@ public class ChatComposite extends Composite {
if (rgb == null || rgb.equals("")) { //$NON-NLS-1$
return new Color(getShell().getDisplay(), 0, 0, 0);
} else {
- final String[] vals = rgb.split(","); //$NON-NLS-1$
+ final String[] vals = StringUtils.split(rgb, ","); //$NON-NLS-1$
return new Color(getShell().getDisplay(), Integer.parseInt(vals[0]), Integer.parseInt(vals[1]), Integer.parseInt(vals[2]));
}
}

Back to the top