Bug 461000 - Provide Remote Services Perspective

Added perspective. Updated texts, added/changed icons.

Change-Id: I0f0d7b5afcb90f3a47ab5a25d7221afaa3c28257
Signed-off-by: Wim Jongman <wim.jongman@remainsoftware.com>

11 files changed, 273 insertions, 203 deletions

diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.remoteservice.ui/META-INF/MANIFEST.MF
index 1a3ee79a5..5cb2cffe1 100644
--- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/META-INF/MANIFEST.MF
+++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/META-INF/MANIFEST.MF
@@ -1,22 +1,21 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.name
-Bundle-SymbolicName: org.eclipse.ecf.remoteservice.ui;singleton:=true
-Bundle-Version: 3.1.0.qualifier
-Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,
- J2SE-1.4
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.ui,
- org.eclipse.core.expressions;bundle-version="3.4.0",
- org.eclipse.ecf;bundle-version="2.0.1",
- org.eclipse.ecf.remoteservice;bundle-version="2.0.0",
- org.eclipse.ecf.discovery;bundle-version="2.1.0",
- org.eclipse.ecf.discovery.ui;bundle-version="3.0.0",
- org.eclipse.ecf.discovery.ui.model;bundle-version="3.0.0"
-Export-Package: org.eclipse.ecf.remoteservices.ui;version="3.0.0"
-Bundle-ActivationPolicy: lazy
-Bundle-Vendor: %plugin.provider
-Bundle-Localization: plugin
-Bundle-Activator: org.eclipse.ecf.internal.remoteservices.ui.Activator
-Import-Package: org.eclipse.ecf.remoteservice.asyncproxy;version="1.0.0",
- org.eclipse.equinox.concurrent.future;version="1.0.0"
+Manifest-Version: 1.0

+Bundle-ManifestVersion: 2

+Bundle-Name: %plugin.name

+Bundle-SymbolicName: org.eclipse.ecf.remoteservice.ui;singleton:=true

+Bundle-Version: 3.1.0.qualifier

+Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Require-Bundle: org.eclipse.core.runtime,

+ org.eclipse.ui,

+ org.eclipse.core.expressions;bundle-version="3.4.0",

+ org.eclipse.ecf;bundle-version="2.0.1",

+ org.eclipse.ecf.remoteservice;bundle-version="2.0.0",

+ org.eclipse.ecf.discovery;bundle-version="2.1.0",

+ org.eclipse.ecf.discovery.ui;bundle-version="3.0.0",

+ org.eclipse.ecf.discovery.ui.model;bundle-version="3.0.0"

+Export-Package: org.eclipse.ecf.remoteservices.ui;version="3.0.0"

+Bundle-ActivationPolicy: lazy

+Bundle-Vendor: %plugin.provider

+Bundle-Localization: plugin

+Bundle-Activator: org.eclipse.ecf.internal.remoteservices.ui.Activator

+Import-Package: org.eclipse.ecf.remoteservice.asyncproxy;version="1.0.0",

+ org.eclipse.equinox.concurrent.future;version="1.0.0"

diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/plugin.properties b/framework/bundles/org.eclipse.ecf.remoteservice.ui/plugin.properties
index 7d2285830..6c520cf9c 100644
--- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/plugin.properties
+++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/plugin.properties
@@ -1,11 +1,12 @@
-############################################################################
-# Copyright (c) 2007 Composent Inc., IBM Corp, and others.
-# All rights reserved. This program and the accompanying materials
-# 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
-#
-############################################################################
-plugin.name=ECF Remote Services UI
-plugin.provider=Eclipse.org - ECF
-
+############################################################################

+# Copyright (c) 2007 Composent Inc., IBM Corp, and others.

+# All rights reserved. This program and the accompanying materials

+# 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

+#

+############################################################################

+plugin.name=ECF Remote Services UI

+plugin.provider=Eclipse.org - ECF

+perspective.name = ECF Remote Services

+

diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/plugin.xml b/framework/bundles/org.eclipse.ecf.remoteservice.ui/plugin.xml
index bcda26eea..89d68f545 100644
--- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/plugin.xml
+++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/plugin.xml
@@ -1,92 +1,101 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension
-         point="org.eclipse.ui.commands">
-      <command
-            defaultHandler="org.eclipse.ecf.internal.remoteservices.ui.handlers.ConnectRemoteServicehandler"
-            id="org.eclipse.ecf.remoteservices.ui.commands.connectCommand"
-            name="Connect Command">
-      </command>
-      <command
-            defaultHandler="org.eclipse.ecf.internal.remoteservices.ui.handlers.ReflectiveRemoteServiceHandler"
-            id="org.eclipse.ecf.remoteservices.ui.commands.reflectiveMethodDialogHandler"
-            name="Reflective Method Invocation Command">
-         <commandParameter
-               id="org.eclipse.ecf.remoteservices.ui.commands.reflectiveMethodDialogParameter"
-               name="name"
-               optional="true">
-         </commandParameter>
-      </command>
-      <command
-            defaultHandler="org.eclipse.ecf.internal.remoteservices.ui.handlers.DisonnectRemoteServicehandler"
-            id="org.eclipse.ecf.remoteservices.ui.commands.disconnectCommand"
-            name="Disconnect Command">
-      </command>
-   </extension>
-   <extension
-         point="org.eclipse.ui.menus">
-      <menuContribution
-            locationURI="popup:org.eclipse.ecf.discovery.ui.DiscoveryView?after=additions">
-         <command
-               commandId="org.eclipse.ecf.remoteservices.ui.commands.connectCommand"
-               id="org.eclipse.ecf.remoteservices.ui.menus.connectCommand"
-               mnemonic="S">
-            <visibleWhen>
-               <with
-                     variable="activeMenuSelection">
-                  <iterate
-                        ifEmpty="false"
-                        operator="and">
-                     <test
-                           property="org.eclipse.ecf.remoteservices.isConnected"
-                           value="false">
-                     </test>
-                     <test
-                           args="remotesvcs"
-                           property="org.eclipse.ecf.discovery.isServiceType"
-                           value="true">
-                     </test>
-                  </iterate>
-               </with>
-            </visibleWhen>
-         </command>
-         <command
-               commandId="org.eclipse.ecf.remoteservices.ui.commands.disconnectCommand"
-               id="org.eclipse.ecf.remoteservices.ui.menus.disconnectCommand"
-               mnemonic="S"
-               style="push">
-            <visibleWhen
-                  checkEnabled="false">
-               <with
-                     variable="activeMenuSelection">
-                  <iterate
-                        ifEmpty="false"
-                        operator="and">
-                     <test
-                           property="org.eclipse.ecf.remoteservices.isConnected"
-                           value="true">
-                     </test>
-                     <test
-                           args="remotesvcs"
-                           property="org.eclipse.ecf.discovery.isServiceType"
-                           value="true">
-                     </test></iterate>
-               </with>
-            </visibleWhen>
-         </command>
-      </menuContribution>
-   </extension>
-
-	 <extension
-         point="org.eclipse.core.expressions.propertyTesters">
-      <propertyTester
-            class="org.eclipse.ecf.internal.remoteservices.ui.property.ConnectedTester"
-            id="org.eclipse.ecf.remoteservices.ui.property.ConnectedPropertyTester"
-            namespace="org.eclipse.ecf.remoteservices"
-            properties="isConnected"
-            type="org.eclipse.ecf.discovery.ui.model.IServiceInfo">
-      </propertyTester>
-   </extension>
-
-</plugin>
+<?xml version="1.0" encoding="UTF-8"?>

+<?eclipse version="3.2"?>

+<plugin>

+   <extension

+         point="org.eclipse.ui.commands">

+      <command

+            defaultHandler="org.eclipse.ecf.internal.remoteservices.ui.handlers.ConnectRemoteServicehandler"

+            id="org.eclipse.ecf.remoteservices.ui.commands.connectCommand"

+            name="Connect Command">

+      </command>

+      <command

+            defaultHandler="org.eclipse.ecf.internal.remoteservices.ui.handlers.ReflectiveRemoteServiceHandler"

+            id="org.eclipse.ecf.remoteservices.ui.commands.reflectiveMethodDialogHandler"

+            name="Reflective Method Invocation Command">

+         <commandParameter

+               id="org.eclipse.ecf.remoteservices.ui.commands.reflectiveMethodDialogParameter"

+               name="name"

+               optional="true">

+         </commandParameter>

+      </command>

+      <command

+            defaultHandler="org.eclipse.ecf.internal.remoteservices.ui.handlers.DisonnectRemoteServicehandler"

+            id="org.eclipse.ecf.remoteservices.ui.commands.disconnectCommand"

+            name="Disconnect Command">

+      </command>

+   </extension>

+   <extension

+         point="org.eclipse.ui.menus">

+      <menuContribution

+            locationURI="popup:org.eclipse.ecf.discovery.ui.DiscoveryView?after=additions">

+         <command

+               commandId="org.eclipse.ecf.remoteservices.ui.commands.connectCommand"

+               id="org.eclipse.ecf.remoteservices.ui.menus.connectCommand"

+               mnemonic="S">

+            <visibleWhen>

+               <with

+                     variable="activeMenuSelection">

+                  <iterate

+                        ifEmpty="false"

+                        operator="and">

+                     <test

+                           property="org.eclipse.ecf.remoteservices.isConnected"

+                           value="false">

+                     </test>

+                     <test

+                           args="remotesvcs"

+                           property="org.eclipse.ecf.discovery.isServiceType"

+                           value="true">

+                     </test>

+                  </iterate>

+               </with>

+            </visibleWhen>

+         </command>

+         <command

+               commandId="org.eclipse.ecf.remoteservices.ui.commands.disconnectCommand"

+               id="org.eclipse.ecf.remoteservices.ui.menus.disconnectCommand"

+               mnemonic="S"

+               style="push">

+            <visibleWhen

+                  checkEnabled="false">

+               <with

+                     variable="activeMenuSelection">

+                  <iterate

+                        ifEmpty="false"

+                        operator="and">

+                     <test

+                           property="org.eclipse.ecf.remoteservices.isConnected"

+                           value="true">

+                     </test>

+                     <test

+                           args="remotesvcs"

+                           property="org.eclipse.ecf.discovery.isServiceType"

+                           value="true">

+                     </test></iterate>

+               </with>

+            </visibleWhen>

+         </command>

+      </menuContribution>

+   </extension>

+

+	 <extension

+         point="org.eclipse.core.expressions.propertyTesters">

+      <propertyTester

+            class="org.eclipse.ecf.internal.remoteservices.ui.property.ConnectedTester"

+            id="org.eclipse.ecf.remoteservices.ui.property.ConnectedPropertyTester"

+            namespace="org.eclipse.ecf.remoteservices"

+            properties="isConnected"

+            type="org.eclipse.ecf.discovery.ui.model.IServiceInfo">

+      </propertyTester>

+   </extension>

+  <extension

+        point="org.eclipse.ui.perspectives">

+     <perspective

+           class="org.eclipse.ecf.internal.remoteservices.ui.RemoteServicePerspective"

+           icon="platform:/plugin/org.eclipse.ecf.ui/icons/enabled/network.png"

+           id="org.eclipse.ecf.internal.remoteservices.ui.remoteServicePerspective"

+           name="%perspective.name">

+     </perspective>

+  </extension>

+

+</plugin>

diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/RemoteServicePerspective.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/RemoteServicePerspective.java
new file mode 100644
index 000000000..b62c16767
--- /dev/null
+++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/RemoteServicePerspective.java
@@ -0,0 +1,60 @@
+/*******************************************************************************

+ * Copyright (c) 2015 Remain Software and others

+ * All rights reserved. This program and the accompanying materials

+ * 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:

+ *     Willem Sietse Jongman - initial API and implementation

+ ******************************************************************************/

+package org.eclipse.ecf.internal.remoteservices.ui;

+

+import org.eclipse.ui.IFolderLayout;

+import org.eclipse.ui.IPageLayout;

+import org.eclipse.ui.IPerspectiveFactory;

+

+public class RemoteServicePerspective implements IPerspectiveFactory {

+

+	public final static String ID = "org.eclipse.ecf.internal.remoteservices.ui.remoteServicePerspective";

+

+	public void createInitialLayout(IPageLayout layout) {

+		defineActions(layout);

+		defineLayout(layout);

+	}

+

+	private void defineActions(IPageLayout layout) {

+		// Add "new wizards".

+		layout.addNewWizardShortcut("org.eclipse.ui.wizards.new.folder");//$NON-NLS-1$

+		layout.addNewWizardShortcut("org.eclipse.ui.wizards.new.file");//$NON-NLS-1$

+

+		// Add "show views".

+		// to be replaced by IPageLayout.ID_PROJECT_EXPLORER

+		layout.addShowViewShortcut("org.eclipse.ui.navigator.ProjectExplorer"); //$NON-NLS-1$

+		layout.addShowViewShortcut(IPageLayout.ID_OUTLINE);

+		layout.addShowViewShortcut(IPageLayout.ID_PROP_SHEET);

+		layout.addShowViewShortcut(IPageLayout.ID_PROGRESS_VIEW);

+	}

+

+	private void defineLayout(IPageLayout layout) {

+		// Editors are placed for free.

+		String editorArea = layout.getEditorArea();

+

+		// Top left.

+		IFolderLayout topLeft = layout.createFolder("topLeft", IPageLayout.LEFT, 0.26f, editorArea); //$NON-NLS-1$

+		topLeft.addView("org.eclipse.ui.navigator.ProjectExplorer"); //$NON-NLS-1$

+

+		// Bottom left.

+		IFolderLayout bottomLeft = layout.createFolder("bottomLeft", //$NON-NLS-1$

+				IPageLayout.BOTTOM, 0.66f, "topLeft"); //$NON-NLS-1$

+		bottomLeft.addView(IPageLayout.ID_PROP_SHEET);

+

+		// Bottom right.

+		IFolderLayout bottomRight = layout.createFolder("bottomRight", //$NON-NLS-1$

+				IPageLayout.BOTTOM, 0.66f, editorArea);

+

+		// Top right.

+		IFolderLayout topRight = layout.createFolder("topRight", IPageLayout.RIGHT, 0.80f, editorArea); //$NON-NLS-1$

+		topRight.addView(IPageLayout.ID_OUTLINE);

+	}

+}

diff --git a/framework/bundles/org.eclipse.ecf.ui/icons/enabled/chat_32X32.png b/framework/bundles/org.eclipse.ecf.ui/icons/enabled/chat_32X32.png
index 21d3eed25..5b49425e0 100644
--- a/framework/bundles/org.eclipse.ecf.ui/icons/enabled/chat_32X32.png
+++ b/framework/bundles/org.eclipse.ecf.ui/icons/enabled/chat_32X32.png
diff --git a/framework/bundles/org.eclipse.ecf.ui/icons/enabled/communicationsecf.png b/framework/bundles/org.eclipse.ecf.ui/icons/enabled/communicationsecf.png
new file mode 100644
index 000000000..223e1598b
--- /dev/null
+++ b/framework/bundles/org.eclipse.ecf.ui/icons/enabled/communicationsecf.png
diff --git a/framework/bundles/org.eclipse.ecf.ui/icons/enabled/logo.png b/framework/bundles/org.eclipse.ecf.ui/icons/enabled/logo.png
new file mode 100644
index 000000000..bfed0f884
--- /dev/null
+++ b/framework/bundles/org.eclipse.ecf.ui/icons/enabled/logo.png
diff --git a/framework/bundles/org.eclipse.ecf.ui/icons/enabled/network.png b/framework/bundles/org.eclipse.ecf.ui/icons/enabled/network.png
new file mode 100644
index 000000000..d0fb9cd46
--- /dev/null
+++ b/framework/bundles/org.eclipse.ecf.ui/icons/enabled/network.png
diff --git a/framework/bundles/org.eclipse.ecf.ui/icons/ovl/ecf.png b/framework/bundles/org.eclipse.ecf.ui/icons/ovl/ecf.png
new file mode 100644
index 000000000..614a8fae0
--- /dev/null
+++ b/framework/bundles/org.eclipse.ecf.ui/icons/ovl/ecf.png
diff --git a/framework/bundles/org.eclipse.ecf.ui/plugin.properties b/framework/bundles/org.eclipse.ecf.ui/plugin.properties
index e3c10f0e4..a78df99d6 100644
--- a/framework/bundles/org.eclipse.ecf.ui/plugin.properties
+++ b/framework/bundles/org.eclipse.ecf.ui/plugin.properties
@@ -1,19 +1,20 @@
-############################################################################
-# Copyright (c) 2007 Composent Inc., IBM Corp, and others.
-# All rights reserved. This program and the accompanying materials
-# 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
-#
-############################################################################
-plugin.name=ECF UI
-plugin.provider=Eclipse.org - ECF
-
-perspective.name = Communications
-view.name=Communications
-preferences.page.name=Communications
-
-configurationWizards.category.client=Clients
-configurationWizards.category.server=Servers
-category.name.Communications = Communications
+############################################################################

+# Copyright (c) 2007 Composent Inc., IBM Corp, and others.

+# All rights reserved. This program and the accompanying materials

+# 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

+#

+############################################################################

+plugin.name=ECF UI

+plugin.provider=Eclipse.org - ECF

+

+perspective.name = ECF Communications

+rsperspective.name = ECF Remote Services

+view.name=Communications

+preferences.page.name=ECF Communications

+

+configurationWizards.category.client=Clients

+configurationWizards.category.server=Servers

+category.name.Communications = ECF Communications

 category.name.Connection = Connection
\ No newline at end of file
diff --git a/framework/bundles/org.eclipse.ecf.ui/plugin.xml b/framework/bundles/org.eclipse.ecf.ui/plugin.xml
index d4a30e05e..8bdcea870 100644
--- a/framework/bundles/org.eclipse.ecf.ui/plugin.xml
+++ b/framework/bundles/org.eclipse.ecf.ui/plugin.xml
@@ -1,60 +1,60 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.1"?>
-<plugin>
-   <extension-point id="connectWizards" name="ECF Connect Wizard" schema="schema/connectWizards.exsd"/>
-   <extension-point id="configurationWizards" name="ECF Container Configuration Wizard" schema="schema/configurationWizards.exsd"/>
-   <extension
-         point="org.eclipse.ecf.ui.configurationWizards">
-      <category
-            id="org.eclipse.ecf.ui.clientcategory"
-            name="%configurationWizards.category.client">
-      </category>
-      <category
-            id="org.eclipse.ecf.ui.servercategory"
-            name="%configurationWizards.category.server">
-      </category>
-   </extension>
-   <extension
-         point="org.eclipse.ui.preferencePages">
-      <page
-            class="org.eclipse.ecf.internal.ui.CategoryPreferencePage"
-            id="org.eclipse.ecf.ui.category"
-            name="%preferences.page.name">
-      </page>
-   </extension>
-   <extension
-         point="org.eclipse.core.runtime.preferences">
-      <initializer
-            class="org.eclipse.ecf.internal.ui.UIPreferenceInitializer">
-      </initializer>
-   </extension>
-   <extension
-         point="org.eclipse.ui.views">
-      <category
-            name="%view.name"
-            id="org.eclipse.ecf.ui.viewcategory"/>
-   </extension>
-   <extension
-         point="org.eclipse.ui.perspectives">
-      <perspective
-            class="org.eclipse.ecf.internal.ui.perspectives.CommunicationPerspective"
-            icon="icons/enabled/communications.gif"
-            id="org.eclipse.ecf.ui.perspective.communications"
-            name="%perspective.name">
-      </perspective>
-   </extension>
-   <extension
-         point="org.eclipse.ui.commands">
-      <category
-            id="org.eclipse.ecf.ui.commands.category"
-            name="%category.name.Communications">
-      </category>
-   </extension>
-   <extension
-         point="org.eclipse.ui.newWizards">
-      <category
-            id="org.eclipse.ecf.ui.newConnection.category"
-            name="%category.name.Connection">
-      </category>
-   </extension>
-</plugin>
+<?xml version="1.0" encoding="UTF-8"?>

+<?eclipse version="3.1"?>

+<plugin>

+   <extension-point id="connectWizards" name="ECF Connect Wizard" schema="schema/connectWizards.exsd"/>

+   <extension-point id="configurationWizards" name="ECF Container Configuration Wizard" schema="schema/configurationWizards.exsd"/>

+   <extension

+         point="org.eclipse.ecf.ui.configurationWizards">

+      <category

+            id="org.eclipse.ecf.ui.clientcategory"

+            name="%configurationWizards.category.client">

+      </category>

+      <category

+            id="org.eclipse.ecf.ui.servercategory"

+            name="%configurationWizards.category.server">

+      </category>

+   </extension>

+   <extension

+         point="org.eclipse.ui.preferencePages">

+      <page

+            class="org.eclipse.ecf.internal.ui.CategoryPreferencePage"

+            id="org.eclipse.ecf.ui.category"

+            name="%preferences.page.name">

+      </page>

+   </extension>

+   <extension

+         point="org.eclipse.core.runtime.preferences">

+      <initializer

+            class="org.eclipse.ecf.internal.ui.UIPreferenceInitializer">

+      </initializer>

+   </extension>

+   <extension

+         point="org.eclipse.ui.views">

+      <category

+            name="%view.name"

+            id="org.eclipse.ecf.ui.viewcategory"/>

+   </extension>

+   <extension

+         point="org.eclipse.ui.perspectives">

+      <perspective

+            class="org.eclipse.ecf.internal.ui.perspectives.CommunicationPerspective"

+            icon="icons/enabled/communicationsecf.png"

+            id="org.eclipse.ecf.ui.perspective.communications"

+            name="%perspective.name">

+      </perspective>

+   </extension>

+   <extension

+         point="org.eclipse.ui.commands">

+      <category

+            id="org.eclipse.ecf.ui.commands.category"

+            name="%category.name.Communications">

+      </category>

+   </extension>

+   <extension

+         point="org.eclipse.ui.newWizards">

+      <category

+            id="org.eclipse.ecf.ui.newConnection.category"

+            name="%category.name.Connection">

+      </category>

+   </extension>

+</plugin>