Menu
▾
▴
[CIShell-SVN] SF.net SVN: cishell: [182] trunk/clients/gui
|
From: <bh...@us...> - 2006-09-13 20:48:09
|
Revision: 182
http://svn.sourceforge.net/cishell/?rev=182&view=rev
Author: bh2
Date: 2006-09-13 13:47:59 -0700 (Wed, 13 Sep 2006)
Log Message:
-----------
moved the update and manage config action classes from the brand plugin to the generic workspace plugin and updated the plugin.xml to reflect that
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.brand.cishell/META-INF/MANIFEST.MF
trunk/clients/gui/org.cishell.reference.gui.brand.cishell/plugin.xml
trunk/clients/gui/org.cishell.reference.gui.workspace/META-INF/MANIFEST.MF
trunk/clients/gui/org.cishell.reference.gui.workspace/src/org/cishell/reference/gui/workspace/CIShellApplication.java
Added Paths:
-----------
trunk/clients/gui/org.cishell.reference.gui.workspace/src/org/cishell/reference/gui/workspace/ManageConfigurationAction.java
trunk/clients/gui/org.cishell.reference.gui.workspace/src/org/cishell/reference/gui/workspace/UpdateAction.java
Removed Paths:
-------------
trunk/clients/gui/org.cishell.reference.gui.brand.cishell/src/org/cishell/reference/gui/brand/cishell/ManageConfigurationAction.java
trunk/clients/gui/org.cishell.reference.gui.brand.cishell/src/org/cishell/reference/gui/brand/cishell/UpdateAction.java
Modified: trunk/clients/gui/org.cishell.reference.gui.brand.cishell/META-INF/MANIFEST.MF
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.brand.cishell/META-INF/MANIFEST.MF 2006-09-12 23:16:48 UTC (rev 181)
+++ trunk/clients/gui/org.cishell.reference.gui.brand.cishell/META-INF/MANIFEST.MF 2006-09-13 20:47:59 UTC (rev 182)
@@ -5,11 +5,10 @@
Bundle-Version: 0.0.1.qualifier
Bundle-Activator: org.cishell.reference.gui.brand.cishell.Activator
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.ui,
org.cishell.reference.gui.datamanager,
org.cishell.reference.gui.log,
org.cishell.reference.gui.workspace,
- org.cishell.reference.gui.menumanager,
- org.eclipse.update.ui
+ org.cishell.reference.gui.menumanager
Eclipse-LazyStart: true
Modified: trunk/clients/gui/org.cishell.reference.gui.brand.cishell/plugin.xml
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.brand.cishell/plugin.xml 2006-09-12 23:16:48 UTC (rev 181)
+++ trunk/clients/gui/org.cishell.reference.gui.brand.cishell/plugin.xml 2006-09-13 20:47:59 UTC (rev 182)
@@ -14,6 +14,9 @@
<property
name="aboutText"
value="%blurb"/>
+ <property
+ name="startupProgressRect"
+ value="0,163,500,10"/>
</product>
</extension>
@@ -39,7 +42,7 @@
</extension>
<extension point="org.eclipse.ui.startup">
- <startup/>
+ <startup class="org.cishell.reference.gui.brand.cishell.Activator"/>
</extension>
<extension
point="org.eclipse.ui.actionSets">
@@ -48,14 +51,14 @@
label="Manager Action Set"
visible="true">
<action
- class="org.cishell.reference.gui.brand.cishell.ManageConfigurationAction"
+ class="org.cishell.reference.gui.workspace.ManageConfigurationAction"
icon="icons/manage.gif"
id="org.cishell.reference.gui.configuration.manager.action"
label="Manage Configuration..."
menubarPath="help/end"
style="push"/>
<action
- class="org.cishell.reference.gui.brand.cishell.UpdateAction"
+ class="org.cishell.reference.gui.workspace.UpdateAction"
icon="icons/findandinstall.gif"
id="org.cishell.reference.gui.update.manager.action"
label="Update..."
Deleted: trunk/clients/gui/org.cishell.reference.gui.brand.cishell/src/org/cishell/reference/gui/brand/cishell/ManageConfigurationAction.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.brand.cishell/src/org/cishell/reference/gui/brand/cishell/ManageConfigurationAction.java 2006-09-12 23:16:48 UTC (rev 181)
+++ trunk/clients/gui/org.cishell.reference.gui.brand.cishell/src/org/cishell/reference/gui/brand/cishell/ManageConfigurationAction.java 2006-09-13 20:47:59 UTC (rev 182)
@@ -1,35 +0,0 @@
-/* ****************************************************************************
- * CIShell: Cyberinfrastructure Shell, An Algorithm Integration Framework.
- *
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Apache License v2.0 which accompanies
- * this distribution, and is available at:
- * http://www.apache.org/licenses/LICENSE-2.0.html
- *
- * Created on Sep 12, 2006 at Indiana University.
- *
- * Contributors:
- * Indiana University -
- * ***************************************************************************/
-package org.cishell.reference.gui.brand.cishell;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.update.ui.UpdateManagerUI;
-
-public class ManageConfigurationAction implements IWorkbenchWindowActionDelegate {
- Shell s;
-
- public void run(IAction action) {
- UpdateManagerUI.openConfigurationManager(s);
- }
-
- public void init(IWorkbenchWindow window) {
- s = window.getShell();
- }
- public void dispose() {}
- public void selectionChanged(IAction action, ISelection selection) {}
-}
Deleted: trunk/clients/gui/org.cishell.reference.gui.brand.cishell/src/org/cishell/reference/gui/brand/cishell/UpdateAction.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.brand.cishell/src/org/cishell/reference/gui/brand/cishell/UpdateAction.java 2006-09-12 23:16:48 UTC (rev 181)
+++ trunk/clients/gui/org.cishell.reference.gui.brand.cishell/src/org/cishell/reference/gui/brand/cishell/UpdateAction.java 2006-09-13 20:47:59 UTC (rev 182)
@@ -1,35 +0,0 @@
-/* ****************************************************************************
- * CIShell: Cyberinfrastructure Shell, An Algorithm Integration Framework.
- *
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Apache License v2.0 which accompanies
- * this distribution, and is available at:
- * http://www.apache.org/licenses/LICENSE-2.0.html
- *
- * Created on Sep 12, 2006 at Indiana University.
- *
- * Contributors:
- * Indiana University -
- * ***************************************************************************/
-package org.cishell.reference.gui.brand.cishell;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.update.ui.UpdateManagerUI;
-
-public class UpdateAction implements IWorkbenchWindowActionDelegate {
- Shell s;
-
- public void run(IAction action) {
- UpdateManagerUI.openInstaller(s);
- }
-
- public void init(IWorkbenchWindow window) {
- s = window.getShell();
- }
- public void dispose() {}
- public void selectionChanged(IAction action, ISelection selection) {}
-}
Modified: trunk/clients/gui/org.cishell.reference.gui.workspace/META-INF/MANIFEST.MF
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.workspace/META-INF/MANIFEST.MF 2006-09-12 23:16:48 UTC (rev 181)
+++ trunk/clients/gui/org.cishell.reference.gui.workspace/META-INF/MANIFEST.MF 2006-09-13 20:47:59 UTC (rev 182)
@@ -6,7 +6,8 @@
Bundle-Activator: org.cishell.reference.gui.workspace.Activator
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime
+ org.eclipse.core.runtime,
+ org.eclipse.update.ui
Eclipse-LazyStart: true
Export-Package: org.cishell.reference.gui.workspace
Import-Package: org.cishell.reference.gui.guibuilder.temp,
Modified: trunk/clients/gui/org.cishell.reference.gui.workspace/src/org/cishell/reference/gui/workspace/CIShellApplication.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.workspace/src/org/cishell/reference/gui/workspace/CIShellApplication.java 2006-09-12 23:16:48 UTC (rev 181)
+++ trunk/clients/gui/org.cishell.reference.gui.workspace/src/org/cishell/reference/gui/workspace/CIShellApplication.java 2006-09-13 20:47:59 UTC (rev 182)
@@ -3,13 +3,14 @@
import org.eclipse.core.runtime.IPlatformRunnable;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IStartup;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
/**
* This class controls all aspects of the application's execution
*/
-public class CIShellApplication implements IPlatformRunnable {
+public class CIShellApplication implements IPlatformRunnable, IStartup {
private static IMenuManager menuManager;
private static IWorkbenchWindow workbench;
@@ -44,4 +45,8 @@
public static IWorkbenchWindow getWorkbench() {
return CIShellApplication.workbench;
}
+
+ public void earlyStartup() {
+
+ }
}
Copied: trunk/clients/gui/org.cishell.reference.gui.workspace/src/org/cishell/reference/gui/workspace/ManageConfigurationAction.java (from rev 181, trunk/clients/gui/org.cishell.reference.gui.brand.cishell/src/org/cishell/reference/gui/brand/cishell/ManageConfigurationAction.java)
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.workspace/src/org/cishell/reference/gui/workspace/ManageConfigurationAction.java (rev 0)
+++ trunk/clients/gui/org.cishell.reference.gui.workspace/src/org/cishell/reference/gui/workspace/ManageConfigurationAction.java 2006-09-13 20:47:59 UTC (rev 182)
@@ -0,0 +1,35 @@
+/* ****************************************************************************
+ * CIShell: Cyberinfrastructure Shell, An Algorithm Integration Framework.
+ *
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the Apache License v2.0 which accompanies
+ * this distribution, and is available at:
+ * http://www.apache.org/licenses/LICENSE-2.0.html
+ *
+ * Created on Sep 12, 2006 at Indiana University.
+ *
+ * Contributors:
+ * Indiana University -
+ * ***************************************************************************/
+package org.cishell.reference.gui.workspace;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.IWorkbenchWindowActionDelegate;
+import org.eclipse.update.ui.UpdateManagerUI;
+
+public class ManageConfigurationAction implements IWorkbenchWindowActionDelegate {
+ Shell s;
+
+ public void run(IAction action) {
+ UpdateManagerUI.openConfigurationManager(s);
+ }
+
+ public void init(IWorkbenchWindow window) {
+ s = window.getShell();
+ }
+ public void dispose() {}
+ public void selectionChanged(IAction action, ISelection selection) {}
+}
Copied: trunk/clients/gui/org.cishell.reference.gui.workspace/src/org/cishell/reference/gui/workspace/UpdateAction.java (from rev 181, trunk/clients/gui/org.cishell.reference.gui.brand.cishell/src/org/cishell/reference/gui/brand/cishell/UpdateAction.java)
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.workspace/src/org/cishell/reference/gui/workspace/UpdateAction.java (rev 0)
+++ trunk/clients/gui/org.cishell.reference.gui.workspace/src/org/cishell/reference/gui/workspace/UpdateAction.java 2006-09-13 20:47:59 UTC (rev 182)
@@ -0,0 +1,35 @@
+/* ****************************************************************************
+ * CIShell: Cyberinfrastructure Shell, An Algorithm Integration Framework.
+ *
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the Apache License v2.0 which accompanies
+ * this distribution, and is available at:
+ * http://www.apache.org/licenses/LICENSE-2.0.html
+ *
+ * Created on Sep 12, 2006 at Indiana University.
+ *
+ * Contributors:
+ * Indiana University -
+ * ***************************************************************************/
+package org.cishell.reference.gui.workspace;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.IWorkbenchWindowActionDelegate;
+import org.eclipse.update.ui.UpdateManagerUI;
+
+public class UpdateAction implements IWorkbenchWindowActionDelegate {
+ Shell s;
+
+ public void run(IAction action) {
+ UpdateManagerUI.openInstaller(s);
+ }
+
+ public void init(IWorkbenchWindow window) {
+ s = window.getShell();
+ }
+ public void dispose() {}
+ public void selectionChanged(IAction action, ISelection selection) {}
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
