Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2015-01-22 13:01:25 +0000
committerEike Stepper2015-01-22 13:01:25 +0000
commit127f85dfd388e0c2704536dc88ba5b1959e39041 (patch)
tree653b465bb347bf0e909ffd853297073dbf8cc3d9 /plugins
parent5240ed791d602787fb60449708fbe9e565eec93e (diff)
downloadcdo-127f85dfd388e0c2704536dc88ba5b1959e39041.tar.gz
cdo-127f85dfd388e0c2704536dc88ba5b1959e39041.tar.xz
cdo-127f85dfd388e0c2704536dc88ba5b1959e39041.zip
[Dawn] Move "Dawn Remote Preferences" under "CDO"
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.tests/META-INF/MANIFEST.MF18
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnSWTBotUtil.java40
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/META-INF/MANIFEST.MF32
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/plugin.xml1
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/preferences/DawnRemotePreferencePage.java12
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/Net4jCommandProvider.java5
6 files changed, 55 insertions, 53 deletions
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.tests/META-INF/MANIFEST.MF
index 2405b5d0de..0d3543f7c4 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.tests
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.100.qualifier
Bundle-Activator: org.eclipse.emf.cdo.dawn.tests.bundle.OM$Activator
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.emf.cdo.tests;bundle-version="[4.0.0,5.0.0)",
@@ -40,13 +40,13 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: %providerName
-Export-Package: org.eclipse.emf.cdo.dawn.tests;version="1.1.0";x-internal:=true,
- org.eclipse.emf.cdo.dawn.tests.bugzillas;version="1.1.0";x-internal:=true,
- org.eclipse.emf.cdo.dawn.tests.bundle;version="1.1.0";x-internal:=true,
- org.eclipse.emf.cdo.dawn.tests.common;version="1.1.0";x-internal:=true,
- org.eclipse.emf.cdo.dawn.tests.ui;version="1.1.0";x-internal:=true,
- org.eclipse.emf.cdo.dawn.tests.ui.emf;version="1.1.0";x-internal:=true,
- org.eclipse.emf.cdo.dawn.tests.ui.gmf;version="1.1.0";x-internal:=true,
- org.eclipse.emf.cdo.dawn.tests.ui.util;version="1.1.0";x-internal:=true
+Export-Package: org.eclipse.emf.cdo.dawn.tests;version="1.1.100";x-internal:=true,
+ org.eclipse.emf.cdo.dawn.tests.bugzillas;version="1.1.100";x-internal:=true,
+ org.eclipse.emf.cdo.dawn.tests.bundle;version="1.1.100";x-internal:=true,
+ org.eclipse.emf.cdo.dawn.tests.common;version="1.1.100";x-internal:=true,
+ org.eclipse.emf.cdo.dawn.tests.ui;version="1.1.100";x-internal:=true,
+ org.eclipse.emf.cdo.dawn.tests.ui.emf;version="1.1.100";x-internal:=true,
+ org.eclipse.emf.cdo.dawn.tests.ui.gmf;version="1.1.100";x-internal:=true,
+ org.eclipse.emf.cdo.dawn.tests.ui.util;version="1.1.100";x-internal:=true
Import-Package: org.antlr.runtime;version="[3.0.0,4.0.0)"
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnSWTBotUtil.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnSWTBotUtil.java
index 6d118b05ee..8881c892ab 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnSWTBotUtil.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnSWTBotUtil.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Martin Fluegge - initial API and implementation
*/
@@ -103,10 +103,10 @@ public class DawnSWTBotUtil
bot.tree().select("Dawn Remote Preferences");
- SWTBotText serverNameLabel = bot.textWithLabel("server name:");
- SWTBotText serverPortLabel = bot.textWithLabel("server port:");
- SWTBotText repositoryLabel = bot.textWithLabel("repository:");
- SWTBotText fileNameLabel = bot.textWithLabel("protocol:");
+ SWTBotText serverNameLabel = bot.textWithLabel("Server Name:");
+ SWTBotText serverPortLabel = bot.textWithLabel("Server Port:");
+ SWTBotText repositoryLabel = bot.textWithLabel("Repository:");
+ SWTBotText fileNameLabel = bot.textWithLabel("Protocol:");
serverNameLabel.setText(serverName);
serverPortLabel.setText(serverPort);
@@ -118,7 +118,7 @@ public class DawnSWTBotUtil
public static List<SWTBotGefEditPart> getAllEditParts(SWTBotGefEditor editor)
{
List<SWTBotGefEditPart> editParts = editor.editParts(new AbstractMatcher<EditPart>()
- {
+ {
@Override
protected boolean doMatch(Object item)
{
@@ -128,7 +128,7 @@ public class DawnSWTBotUtil
public void describeTo(Description description)
{
}
- });
+ });
return editParts;
}
@@ -140,7 +140,7 @@ public class DawnSWTBotUtil
public static List<SWTBotGefEditPart> getConnectionEditParts(SWTBotGefEditor editor, Class<? extends EditPart> clazz,
List<SWTBotGefEditPart> editParts)
- {
+ {
List<SWTBotGefEditPart> ret = new ArrayList<SWTBotGefEditPart>();
for (SWTBotGefEditPart editPart : editParts)
@@ -155,7 +155,7 @@ public class DawnSWTBotUtil
}
}
return ret;
- }
+ }
static Object monitor = new Object();
@@ -165,7 +165,7 @@ public class DawnSWTBotUtil
public static List<SWTBotGefEditPart> getAllConnections(final SWTBotGefEditor editor)
{
AbstractMatcher<EditPart> matcher = new AbstractMatcher<EditPart>()
- {
+ {
@Override
protected boolean doMatch(Object item)
{
@@ -175,16 +175,16 @@ public class DawnSWTBotUtil
public void describeTo(Description description)
{
}
- };
- List<SWTBotGefEditPart> aClassEditParts = editor.editParts(matcher);
+ };
+ List<SWTBotGefEditPart> aClassEditParts = editor.editParts(matcher);
- List<SWTBotGefEditPart> ret = new ArrayList<SWTBotGefEditPart>();
+ List<SWTBotGefEditPart> ret = new ArrayList<SWTBotGefEditPart>();
- for (SWTBotGefEditPart editPart : aClassEditParts)
- {
- ret.addAll(editPart.sourceConnections());
- }
- return ret;
+ for (SWTBotGefEditPart editPart : aClassEditParts)
+ {
+ ret.addAll(editPart.sourceConnections());
+ }
+ return ret;
}
public static Node createNewNodeRemote(Diagram diagram, AClass newAClass, String type)
@@ -322,7 +322,7 @@ public class DawnSWTBotUtil
}
final MenuItem menuItem = UIThreadRunnable.syncExec(new WidgetResult<MenuItem>()
- {
+ {
public MenuItem run()
{
MenuItem menuItem = null;
@@ -339,7 +339,7 @@ public class DawnSWTBotUtil
return menuItem;
}
- });
+ });
if (menuItem == null)
{
throw new WidgetNotFoundException("Could not find menu: " + Arrays.asList(texts));
diff --git a/plugins/org.eclipse.emf.cdo.dawn/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn/META-INF/MANIFEST.MF
index fe5987a486..8f19617416 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.cdo.dawn;singleton:=true
-Bundle-Version: 2.0.200.qualifier
+Bundle-Version: 2.0.300.qualifier
Bundle-Activator: org.eclipse.emf.cdo.dawn.DawnRuntimePlugin
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
@@ -14,19 +14,19 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.emf.transaction;bundle-version="[1.4.0,2.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.cdo.dawn;version="2.0.200",
- org.eclipse.emf.cdo.dawn.actions;version="2.0.200";x-internal:=true,
- org.eclipse.emf.cdo.dawn.appearance;version="2.0.200",
- org.eclipse.emf.cdo.dawn.commands;version="2.0.200",
- org.eclipse.emf.cdo.dawn.conflicts;version="2.0.200",
- org.eclipse.emf.cdo.dawn.editors;version="2.0.200",
- org.eclipse.emf.cdo.dawn.editors.impl;version="2.0.200",
- org.eclipse.emf.cdo.dawn.helper;version="2.0.200",
- org.eclipse.emf.cdo.dawn.notifications;version="2.0.200",
- org.eclipse.emf.cdo.dawn.preferences;version="2.0.200",
- org.eclipse.emf.cdo.dawn.resources;version="2.0.200",
- org.eclipse.emf.cdo.dawn.resources.impl;version="2.0.200",
- org.eclipse.emf.cdo.dawn.spi;version="2.0.200",
- org.eclipse.emf.cdo.dawn.transaction;version="2.0.200",
- org.eclipse.emf.cdo.internal.dawn.bundle;version="2.0.200"
+Export-Package: org.eclipse.emf.cdo.dawn;version="2.0.300",
+ org.eclipse.emf.cdo.dawn.actions;version="2.0.300";x-internal:=true,
+ org.eclipse.emf.cdo.dawn.appearance;version="2.0.300",
+ org.eclipse.emf.cdo.dawn.commands;version="2.0.300",
+ org.eclipse.emf.cdo.dawn.conflicts;version="2.0.300",
+ org.eclipse.emf.cdo.dawn.editors;version="2.0.300",
+ org.eclipse.emf.cdo.dawn.editors.impl;version="2.0.300",
+ org.eclipse.emf.cdo.dawn.helper;version="2.0.300",
+ org.eclipse.emf.cdo.dawn.notifications;version="2.0.300",
+ org.eclipse.emf.cdo.dawn.preferences;version="2.0.300",
+ org.eclipse.emf.cdo.dawn.resources;version="2.0.300",
+ org.eclipse.emf.cdo.dawn.resources.impl;version="2.0.300",
+ org.eclipse.emf.cdo.dawn.spi;version="2.0.300",
+ org.eclipse.emf.cdo.dawn.transaction;version="2.0.300",
+ org.eclipse.emf.cdo.internal.dawn.bundle;version="2.0.300"
Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.cdo.dawn/plugin.xml b/plugins/org.eclipse.emf.cdo.dawn/plugin.xml
index 249ebc50b8..05135f064f 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.dawn/plugin.xml
@@ -87,6 +87,7 @@
<extension
point="org.eclipse.ui.preferencePages">
<page
+ category="org.eclipse.emf.cdo.ui.CDOPreferencePage"
class="org.eclipse.emf.cdo.dawn.preferences.DawnRemotePreferencePage"
id="org.eclipse.emf.cdo.dawn.views.preferences.DawnRemotePreferencePage"
name="Dawn Remote Preferences">
diff --git a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/preferences/DawnRemotePreferencePage.java b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/preferences/DawnRemotePreferencePage.java
index 8bf4da24e0..79c3807545 100644
--- a/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/preferences/DawnRemotePreferencePage.java
+++ b/plugins/org.eclipse.emf.cdo.dawn/src/org/eclipse/emf/cdo/dawn/preferences/DawnRemotePreferencePage.java
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Martin Fluegge - initial API and implementation
*/
@@ -30,7 +30,7 @@ public class DawnRemotePreferencePage extends FieldEditorPreferencePage implemen
super(GRID);
AbstractUIPlugin pluginInstance = DawnRuntimePlugin.getDefault();
setPreferenceStore(pluginInstance.getPreferenceStore()); // TODO generation
- setDescription("Dawn Reference Pages");
+ setDescription("Connect to a CDO repository.");
}
/**
@@ -40,11 +40,11 @@ public class DawnRemotePreferencePage extends FieldEditorPreferencePage implemen
@Override
public void createFieldEditors()
{
- addField(new StringFieldEditor(PreferenceConstants.P_SERVER_NAME, "server name:", getFieldEditorParent()));
- addField(new IntegerFieldEditor(PreferenceConstants.P_SERVER_PORT, "server port:", getFieldEditorParent()));
- addField(new StringFieldEditor(PreferenceConstants.P_REPOSITORY_NAME, "repository:", getFieldEditorParent()));
+ addField(new StringFieldEditor(PreferenceConstants.P_SERVER_NAME, "Server Name:", getFieldEditorParent()));
+ addField(new IntegerFieldEditor(PreferenceConstants.P_SERVER_PORT, "Server Port:", getFieldEditorParent()));
+ addField(new StringFieldEditor(PreferenceConstants.P_REPOSITORY_NAME, "Repository:", getFieldEditorParent()));
// TODO change this to a list of repositories to allow auto connection for the clients
- addField(new StringFieldEditor(PreferenceConstants.P_PROTOCOL, "protocol:", getFieldEditorParent()));
+ addField(new StringFieldEditor(PreferenceConstants.P_PROTOCOL, "Protocol:", getFieldEditorParent()));
}
/*
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/Net4jCommandProvider.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/Net4jCommandProvider.java
index c07bb7135b..61a0365ea2 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/Net4jCommandProvider.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/Net4jCommandProvider.java
@@ -100,8 +100,9 @@ public class Net4jCommandProvider implements CommandProvider
IPluginContainer container = getContainer();
for (String factoryType : container.getFactoryTypes(productGroup))
{
- interpreter.println(prefix + factoryType);
- printElements(interpreter, container.getElements(productGroup, factoryType), prefix + INDENT);
+ Object[] elements = container.getElements(productGroup, factoryType);
+ interpreter.println(prefix + factoryType + " (" + elements.length + ")");
+ printElements(interpreter, elements, prefix + INDENT);
}
}

Back to the top