diff options
5 files changed, 8 insertions, 6 deletions
diff --git a/examples/bundles/org.eclipse.ecf.example.collab.editor/src/org/eclipse/ecf/example/collab/editor/actions/InitiateSharedSessionAction.java b/examples/bundles/org.eclipse.ecf.example.collab.editor/src/org/eclipse/ecf/example/collab/editor/actions/InitiateSharedSessionAction.java index bce0d1233..26d200570 100644 --- a/examples/bundles/org.eclipse.ecf.example.collab.editor/src/org/eclipse/ecf/example/collab/editor/actions/InitiateSharedSessionAction.java +++ b/examples/bundles/org.eclipse.ecf.example.collab.editor/src/org/eclipse/ecf/example/collab/editor/actions/InitiateSharedSessionAction.java @@ -22,7 +22,6 @@ import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.ui.IEditorDescriptor; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.IEditorRegistry; import org.eclipse.ui.IObjectActionDelegate; import org.eclipse.ui.IViewActionDelegate; import org.eclipse.ui.IViewPart; diff --git a/examples/bundles/org.eclipse.ecf.example.collab.editor/src/org/eclipse/ecf/example/collab/editor/listeners/EditChannelListener.java b/examples/bundles/org.eclipse.ecf.example.collab.editor/src/org/eclipse/ecf/example/collab/editor/listeners/EditChannelListener.java index 5a6b9ee3c..09a0746f0 100644 --- a/examples/bundles/org.eclipse.ecf.example.collab.editor/src/org/eclipse/ecf/example/collab/editor/listeners/EditChannelListener.java +++ b/examples/bundles/org.eclipse.ecf.example.collab.editor/src/org/eclipse/ecf/example/collab/editor/listeners/EditChannelListener.java @@ -20,7 +20,6 @@ import org.eclipse.ecf.datashare.events.IChannelMessageEvent; import org.eclipse.ecf.example.collab.editor.Activator; import org.eclipse.ecf.example.collab.editor.message.EditorChangeMessage; import org.eclipse.ecf.example.collab.editor.message.EditorUpdateRequest; -import org.eclipse.jface.text.DocumentEvent; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.TextSelection; import org.eclipse.jface.viewers.ISelection; diff --git a/examples/bundles/org.eclipse.ecf.example.collab.editor/src/org/eclipse/ecf/example/collab/editor/wizards/NewSharedSessionWizardPage.java b/examples/bundles/org.eclipse.ecf.example.collab.editor/src/org/eclipse/ecf/example/collab/editor/wizards/NewSharedSessionWizardPage.java index 6440bcc72..36adbe93c 100644 --- a/examples/bundles/org.eclipse.ecf.example.collab.editor/src/org/eclipse/ecf/example/collab/editor/wizards/NewSharedSessionWizardPage.java +++ b/examples/bundles/org.eclipse.ecf.example.collab.editor/src/org/eclipse/ecf/example/collab/editor/wizards/NewSharedSessionWizardPage.java @@ -12,9 +12,11 @@ package org.eclipse.ecf.example.collab.editor.wizards; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.ObjectInputStream; +import java.text.DateFormat; import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import java.util.TimeZone; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IResource; @@ -187,8 +189,10 @@ public class NewSharedSessionWizardPage extends WizardPage { case 1: text = instance.getOwner(); break; - case 2: - text = instance.getCreated().toGMTString(); + case 2: + DateFormat df = DateFormat.getInstance(); + df.setTimeZone(TimeZone.getTimeZone("GMT")); + text = df.format(instance.getCreated()); break; default: text = ""; diff --git a/examples/bundles/org.eclipse.ecf.sdo/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.sdo/META-INF/MANIFEST.MF index 16d97c4c0..d21b0e841 100644 --- a/examples/bundles/org.eclipse.ecf.sdo/META-INF/MANIFEST.MF +++ b/examples/bundles/org.eclipse.ecf.sdo/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Bundle-Name: ECF SDO API -Bundle-SymbolicName: org.eclipse.ecf.sdo;singleton=true +Bundle-SymbolicName: org.eclipse.ecf.sdo;singleton:=true Bundle-Version: 0.9.3 Bundle-ClassPath: ecf.sdo.jar Bundle-Activator: org.eclipse.ecf.sdo.SDOPlugin$EclipsePlugin diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/dialogs/AddBuddyDialog.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/dialogs/AddBuddyDialog.java index a92f2b954..aa1061d94 100644 --- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/dialogs/AddBuddyDialog.java +++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/dialogs/AddBuddyDialog.java @@ -62,7 +62,7 @@ public class AddBuddyDialog extends Dialog { gridLayout_2.numColumns = 2; composite.setLayout(gridLayout_2); - final Label l = new Label(composite, SWT.NONE); + //final Label l = new Label(composite, SWT.NONE); final Label label_4 = new Label(composite, SWT.NONE); label_4.setText("<user>@<jabberserver>"); |