|
From: <bea...@us...> - 2006-09-19 17:48:15
|
Revision: 202
http://svn.sourceforge.net/cishell/?rev=202&view=rev
Author: bearsfan
Date: 2006-09-19 10:48:09 -0700 (Tue, 19 Sep 2006)
Log Message:
-----------
Direct conversion of the previous version of the data manager viewer required some external helper classes.
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.datamanager/META-INF/MANIFEST.MF
trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/Activator.java
Removed Paths:
-------------
trunk/clients/gui/org.cishell.reference.gui.datamanager/icons/
trunk/clients/gui/org.cishell.reference.gui.datamanager/plugin.xml
trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/DataManagerView.java
Modified: trunk/clients/gui/org.cishell.reference.gui.datamanager/META-INF/MANIFEST.MF
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.datamanager/META-INF/MANIFEST.MF 2006-09-19 14:02:36 UTC (rev 201)
+++ trunk/clients/gui/org.cishell.reference.gui.datamanager/META-INF/MANIFEST.MF 2006-09-19 17:48:09 UTC (rev 202)
@@ -8,3 +8,8 @@
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime
Eclipse-LazyStart: true
+Import-Package: org.cishell.app.service.datamanager,
+ org.cishell.framework,
+ org.cishell.framework.data,
+ org.osgi.service.log;version="1.3.0"
+Export-Package: org.cishell.reference.gui.datamanager
Deleted: trunk/clients/gui/org.cishell.reference.gui.datamanager/plugin.xml
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.datamanager/plugin.xml 2006-09-19 14:02:36 UTC (rev 201)
+++ trunk/clients/gui/org.cishell.reference.gui.datamanager/plugin.xml 2006-09-19 17:48:09 UTC (rev 202)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
- <extension
- point="org.eclipse.ui.views">
- <view
- allowMultiple="false"
- class="org.cishell.reference.gui.datamanager.DataManagerView"
- icon="icons/datamanager_icon.gif"
- id="org.cishell.reference.gui.datamanager.DataManagerView"
- name="Data Manager"/>
- </extension>
-</plugin>
Modified: trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/Activator.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/Activator.java 2006-09-19 14:02:36 UTC (rev 201)
+++ trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/Activator.java 2006-09-19 17:48:09 UTC (rev 202)
@@ -1,7 +1,9 @@
package org.cishell.reference.gui.datamanager;
+import org.cishell.app.service.datamanager.DataManagerService;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
+import org.osgi.service.log.LogService;
/**
* The activator class controls the plug-in life cycle
@@ -10,6 +12,7 @@
// The plug-in ID
public static final String PLUGIN_ID = "org.cishell.reference.gui.datamanager";
+ private static BundleContext context;
// The shared instance
private static Activator plugin;
@@ -27,6 +30,8 @@
*/
public void start(BundleContext context) throws Exception {
super.start(context);
+
+ Activator.context = context;
}
/*
@@ -46,5 +51,18 @@
public static Activator getDefault() {
return plugin;
}
-
+
+ protected static DataManagerService getDataManagerService() {
+ DataManagerService manager = (DataManagerService) context.getService(
+ context.getServiceReference(DataManagerService.class.getName()));
+
+ return manager;
+ }
+
+ protected static LogService getLogService() {
+ LogService log = (LogService) context.getService(
+ context.getServiceReference(LogService.class.getName()));
+
+ return log;
+ }
}
Deleted: trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/DataManagerView.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/DataManagerView.java 2006-09-19 14:02:36 UTC (rev 201)
+++ trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/DataManagerView.java 2006-09-19 17:48:09 UTC (rev 202)
@@ -1,41 +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 Aug 21, 2006 at Indiana University.
- *
- * Contributors:
- * Indiana University -
- * ***************************************************************************/
-package org.cishell.reference.gui.datamanager;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.part.ViewPart;
-
-/**
- *
- * @author Bruce Herr (bh...@bh...)
- */
-public class DataManagerView extends ViewPart {
-
- public DataManagerView() {}
-
- /**
- * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
- */
- public void createPartControl(Composite parent) {
- Label label = new Label(parent, SWT.NONE);
- label.setText("Data Manager");
- }
-
- /**
- * @see org.eclipse.ui.part.WorkbenchPart#setFocus()
- */
- public void setFocus() {}
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|