Menu
▾
▴
[CIShell-SVN] SF.net SVN: cishell: [355] trunk/clients/gui/org.cishell.reference.gui. brand.cishell
|
From: <bh...@us...> - 2006-12-20 19:17:27
|
Revision: 355
http://svn.sourceforge.net/cishell/?rev=355&view=rev
Author: bh2
Date: 2006-12-20 11:17:15 -0800 (Wed, 20 Dec 2006)
Log Message:
-----------
Changes for the cishell reference gui brand:
* made scheduler not closeable
* rearranged the perspective w/ new scheduler
* added blurb support (finally) for the brand
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.properties
trunk/clients/gui/org.cishell.reference.gui.brand.cishell/plugin.xml
trunk/clients/gui/org.cishell.reference.gui.brand.cishell/src/org/cishell/reference/gui/brand/cishell/Activator.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-12-19 21:36:58 UTC (rev 354)
+++ trunk/clients/gui/org.cishell.reference.gui.brand.cishell/META-INF/MANIFEST.MF 2006-12-20 19:17:15 UTC (rev 355)
@@ -12,4 +12,5 @@
org.cishell.reference.gui.workspace,
org.cishell.reference.gui.menumanager
Eclipse-LazyStart: true
-Import-Package: org.cishell.app.service.datamanager
+Import-Package: org.cishell.app.service.datamanager,
+ org.osgi.service.log;version="1.3.0"
Modified: trunk/clients/gui/org.cishell.reference.gui.brand.cishell/plugin.properties
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.brand.cishell/plugin.properties 2006-12-19 21:36:58 UTC (rev 354)
+++ trunk/clients/gui/org.cishell.reference.gui.brand.cishell/plugin.properties 2006-12-20 19:17:15 UTC (rev 355)
@@ -2,4 +2,12 @@
appName = CIShellApplication
aboutImage = icons/about.gif
windowImages = icons/alt16.gif,icons/alt32.gif,icons/alt64.gif
-blurb = CIShell - Cyberinfrastructure Shell
+blurb = Welcome to the Cyberinfrastructure Shell (CIShell) \
+developed at the InfoVis Lab and the CI for Network Science Center \
+at Indiana University.\n\n\
+Please acknowledge this effort by citing:\n\
+Bruce Herr, Weixia Huang, Shashikant Penumarthy, and Katy Borner. (in press). \
+Designing Highly Flexible and Usable Cyberinfrastructures for Convergence. \
+William S. Bainbridge (Ed.) Progress in Convergence. Annals of the New York Academy of Sciences.\n\
+http://cishell.org/papers/06-cishell.pdf
+
Modified: trunk/clients/gui/org.cishell.reference.gui.brand.cishell/plugin.xml
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.brand.cishell/plugin.xml 2006-12-19 21:36:58 UTC (rev 354)
+++ trunk/clients/gui/org.cishell.reference.gui.brand.cishell/plugin.xml 2006-12-20 19:17:15 UTC (rev 355)
@@ -43,6 +43,17 @@
closeable = "false"
ratio="0.60"/>
</perspectiveExtension>
+
+ <perspectiveExtension targetID="org.cishell.reference.gui.workspace.Perspective">
+ <view
+ closeable="false"
+ id="org.cishell.reference.gui.scheduler.SchedulerView"
+ moveable="true"
+ ratio="0.60"
+ relationship="bottom"
+ relative="org.cishell.reference.gui.log.LogView"
+ visible="true"/>
+ </perspectiveExtension>
<perspectiveExtension targetID="org.cishell.reference.gui.workspace.Perspective">
<view id="org.cishell.reference.gui.datamanager.DataManagerView"
@@ -54,15 +65,6 @@
visible="true"/>
</perspectiveExtension>
- <perspectiveExtension targetID="org.cishell.reference.gui.workspace.Perspective">
- <view id="org.cishell.reference.gui.scheduler.SchedulerView"
- relative="org.eclipse.ui.editors"
- relationship="bottom"
- ratio="1.00"
- moveable = "true"
- closeable = "true"
- visible="true"/>
- </perspectiveExtension>
</extension>
<extension point="org.eclipse.ui.startup">
Modified: trunk/clients/gui/org.cishell.reference.gui.brand.cishell/src/org/cishell/reference/gui/brand/cishell/Activator.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.brand.cishell/src/org/cishell/reference/gui/brand/cishell/Activator.java 2006-12-19 21:36:58 UTC (rev 354)
+++ trunk/clients/gui/org.cishell.reference.gui.brand.cishell/src/org/cishell/reference/gui/brand/cishell/Activator.java 2006-12-20 19:17:15 UTC (rev 355)
@@ -1,54 +1,66 @@
package org.cishell.reference.gui.brand.cishell;
+import java.io.IOException;
+import java.util.Properties;
+
import org.eclipse.ui.IStartup;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.log.LogService;
-/**
- * The activator class controls the plug-in life cycle
- */
public class Activator extends AbstractUIPlugin implements IStartup {
+ private BundleContext bContext;
+ private boolean alreadyLogged;
// The plug-in ID
public static final String PLUGIN_ID = "org.cishell.reference.gui.brand.cishell";
-
- // The shared instance
private static Activator plugin;
- /**
- * The constructor
- */
public Activator() {
plugin = this;
+ alreadyLogged = false;
}
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
public void start(BundleContext context) throws Exception {
super.start(context);
+ this.bContext = context;
+
+ if (!alreadyLogged) {
+ earlyStartup();
+ }
}
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
public void stop(BundleContext context) throws Exception {
plugin = null;
super.stop(context);
}
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
public static Activator getDefault() {
return plugin;
}
public void earlyStartup() {
- //TODO: Get log and print initial log blurb
+ if (bContext != null) {
+ String blurb = null;
+ Properties props = new Properties();
+
+ try {
+ props.load(bContext.getBundle().getEntry("/plugin.properties").openStream());
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ blurb = props.getProperty("blurb", null);
+
+ ServiceReference ref = bContext.getServiceReference(LogService.class.getName());
+
+ if (ref != null && blurb != null) {
+ alreadyLogged = true;
+
+ LogService logger = (LogService)bContext.getService(ref);
+ logger.log(LogService.LOG_INFO, blurb);
+ }
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
