From eff36d37776993792c68e229fbb61b02b425b0ce Mon Sep 17 00:00:00 2001
From: Eike Stepper
Date: Fri, 28 Sep 2007 15:18:43 +0000
Subject: [204732] Add dialog for "Open Session"
https://bugs.eclipse.org/bugs/show_bug.cgi?id=204732
---
plugins/org.eclipse.emf.cdo.ui/CDOClient1.launch | 148 ++++++++++-----------
.../net4j/internal/ui/views/ConnectorsView.java | 21 ++-
.../eclipse/net4j/util/ui/widgets/HistoryText.java | 63 ---------
3 files changed, 83 insertions(+), 149 deletions(-)
diff --git a/plugins/org.eclipse.emf.cdo.ui/CDOClient1.launch b/plugins/org.eclipse.emf.cdo.ui/CDOClient1.launch
index 99d7aaa69f..1d0e988d95 100644
--- a/plugins/org.eclipse.emf.cdo.ui/CDOClient1.launch
+++ b/plugins/org.eclipse.emf.cdo.ui/CDOClient1.launch
@@ -42,22 +42,22 @@
-
+
-
-
+
+
-
-
+
+
@@ -65,39 +65,39 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -105,8 +105,8 @@
-
+
@@ -115,14 +115,14 @@
-
-
+
+
-
-
+
+
@@ -130,23 +130,23 @@
-
+
-
+
-
-
+
+
-
+
@@ -156,19 +156,19 @@
-
+
-
+
-
+
@@ -178,17 +178,17 @@
-
-
+
+
-
-
+
+
@@ -202,34 +202,34 @@
-
-
+
+
-
-
+
-
+
+
-
+
-
+
-
+
@@ -237,8 +237,8 @@
-
+
@@ -246,8 +246,8 @@
-
+
@@ -263,11 +263,11 @@
-
+
-
+
@@ -281,10 +281,10 @@
-
-
+
+
@@ -296,29 +296,29 @@
-
+
-
+
-
+
-
+
-
+
@@ -330,8 +330,8 @@
-
+
@@ -340,19 +340,19 @@
-
+
-
+
-
-
-
+
+
-
+
+
@@ -368,23 +368,23 @@
-
+
-
+
-
+
-
+
@@ -392,51 +392,51 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
-
+
-
+
+
-
+
@@ -444,23 +444,23 @@
-
+
-
+
-
+
-
+
diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/ConnectorsView.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/ConnectorsView.java
index 5da15fb06e..03a5dbdf5c 100644
--- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/ConnectorsView.java
+++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/ConnectorsView.java
@@ -1,28 +1,25 @@
package org.eclipse.net4j.internal.ui.views;
import org.eclipse.net4j.IConnector;
-import org.eclipse.net4j.Net4jUtil;
import org.eclipse.net4j.util.container.IContainer;
import org.eclipse.net4j.util.container.IManagedContainer;
import org.eclipse.net4j.util.container.IPluginContainer;
-import org.eclipse.net4j.util.ui.actions.SafeAction;
import org.eclipse.net4j.util.ui.views.ContainerItemProvider;
import org.eclipse.net4j.util.ui.views.ContainerView;
import org.eclipse.net4j.util.ui.views.IElementFilter;
-import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IToolBarManager;
public class ConnectorsView extends ContainerView
{
- private Action addConnectorAction = new SafeAction("Add Connector", "Add a connector", getAddImageDescriptor())
- {
- @Override
- protected void doRun() throws Exception
- {
- Net4jUtil.getConnector(IPluginContainer.INSTANCE, "tcp", "127.0.0.1:2036");
- }
- };
+ // private Action addConnectorAction = new SafeAction("Add Connector", "Add a connector", getAddImageDescriptor())
+ // {
+ // @Override
+ // protected void doRun() throws Exception
+ // {
+ // Net4jUtil.getConnector(IPluginContainer.INSTANCE, "tcp", "127.0.0.1:2036");
+ // }
+ // };
public ConnectorsView()
{
@@ -49,7 +46,7 @@ public class ConnectorsView extends ContainerView
@Override
protected void fillLocalToolBar(IToolBarManager manager)
{
- manager.add(addConnectorAction);
+ // manager.add(addConnectorAction);
super.fillLocalToolBar(manager);
}
}
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/HistoryText.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/HistoryText.java
index 9f1c79320e..be622213aa 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/HistoryText.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/HistoryText.java
@@ -23,9 +23,6 @@ import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CCombo;
import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.events.VerifyListener;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Text;
@@ -109,41 +106,11 @@ public class HistoryText
return combo;
}
- public void addModifyListener(ModifyListener listener)
- {
- combo.addModifyListener(listener);
- }
-
- public void addSelectionListener(SelectionListener listener)
- {
- combo.addSelectionListener(listener);
- }
-
- public void addVerifyListener(VerifyListener listener)
- {
- combo.addVerifyListener(listener);
- }
-
public void append(String string)
{
combo.setText(combo.getText() + string);
}
- public void clearSelection()
- {
- combo.clearSelection();
- }
-
- public void copy()
- {
- combo.copy();
- }
-
- public void cut()
- {
- combo.cut();
- }
-
public int getCharCount()
{
return combo.getText().length();
@@ -169,41 +136,11 @@ public class HistoryText
return combo.getText();
}
- public int getTextLimit()
- {
- return combo.getTextLimit();
- }
-
- public void paste()
- {
- combo.paste();
- }
-
- public void removeModifyListener(ModifyListener listener)
- {
- combo.removeModifyListener(listener);
- }
-
- public void removeSelectionListener(SelectionListener listener)
- {
- combo.removeSelectionListener(listener);
- }
-
- public void removeVerifyListener(VerifyListener listener)
- {
- combo.removeVerifyListener(listener);
- }
-
public void setText(String string)
{
combo.setText(string);
}
- public void setTextLimit(int limit)
- {
- combo.setTextLimit(limit);
- }
-
public boolean setFocus()
{
return combo.setFocus();
--
cgit v1.2.3