Author: slotia
Date: 2012-07-23 16:27:28 -0700 (Mon, 23 Jul 2012)
New Revision: 29966
Modified:
core3/impl/trunk/table-import-impl/pom.xml
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/CyActivator.java
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/ui/ImportTablePanel.java
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/util/CytoscapeServices.java
Log:
Added emission of events thru EventAdmin
Modified: core3/impl/trunk/table-import-impl/pom.xml
===================================================================
--- core3/impl/trunk/table-import-impl/pom.xml 2012-07-23 23:26:49 UTC (rev
29965)
+++ core3/impl/trunk/table-import-impl/pom.xml 2012-07-23 23:27:28 UTC (rev
29966)
@@ -137,6 +137,11 @@
<version>1.0.3</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.eventadmin</artifactId>
+ <version>1.2.14</version>
+ </dependency>
<!-- Apache poi -->
<dependency>
Modified:
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/CyActivator.java
2012-07-23 23:26:49 UTC (rev 29965)
+++
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/CyActivator.java
2012-07-23 23:27:28 UTC (rev 29966)
@@ -41,6 +41,7 @@
import org.osgi.framework.BundleContext;
+import org.osgi.service.event.EventAdmin;
import org.cytoscape.service.util.AbstractCyActivator;
@@ -77,6 +78,7 @@
CytoscapeServices.streamUtil = getService(bc,StreamUtil.class);
CytoscapeServices.cyEventHelper =
getService(bc,CyEventHelper.class);
CytoscapeServices.mapGlobalToLocalTableTaskFactory =
getService(bc, MapGlobalToLocalTableTaskFactory.class);
+ CytoscapeServices.eventAdmin = getService(bc, EventAdmin.class);
Modified:
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/ui/ImportTablePanel.java
===================================================================
---
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/ui/ImportTablePanel.java
2012-07-23 23:26:49 UTC (rev 29965)
+++
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/ui/ImportTablePanel.java
2012-07-23 23:27:28 UTC (rev 29966)
@@ -131,6 +131,8 @@
import org.cytoscape.util.swing.JStatusBar;
import org.cytoscape.work.Task;
import org.cytoscape.work.TaskManager;
+import org.osgi.service.event.EventAdmin;
+import org.osgi.service.event.Event;
import org.jdesktop.layout.GroupLayout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -231,6 +233,7 @@
private final CyNetworkManager manager;
private final CyTableFactory tableFactory;
private final CyTableManager tableManager;
+ private final EventAdmin eventAdmin;
private File tempFile;
public ImportTablePanel(final int dialogType, final InputStream is,
final String fileType,
@@ -259,6 +262,7 @@
this.manager = manager;
this.tableFactory = tableFactory;
this.tableManager = tableManager;
+ this.eventAdmin = CytoscapeServices.eventAdmin;
if (dialogType != ONTOLOGY_AND_ANNOTATION_IMPORT) {
@@ -1585,6 +1589,9 @@
private void
textImportCheckBoxActionPerformed(java.awt.event.ActionEvent evt) {
if (textImportCheckBox.isSelected()) {
textImportOptionPanel.setVisible(true);
+ final Map<String,String> props = new HashMap<String,String>();
+ props.put("action", "show text file import options");
+ eventAdmin.postEvent(new Event("org/cytoscape/gettingstarted",
props));
} else {
textImportOptionPanel.setVisible(false);
}
Modified:
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/util/CytoscapeServices.java
===================================================================
---
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/util/CytoscapeServices.java
2012-07-23 23:26:49 UTC (rev 29965)
+++
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/util/CytoscapeServices.java
2012-07-23 23:27:28 UTC (rev 29966)
@@ -20,6 +20,7 @@
import org.cytoscape.util.swing.OpenBrowser;
import org.cytoscape.util.swing.FileUtil;
import org.cytoscape.io.util.StreamUtil;
+import org.osgi.service.event.EventAdmin;
public class CytoscapeServices {
@@ -43,4 +44,5 @@
public static StreamUtil streamUtil;
public static CyEventHelper cyEventHelper;
public static MapGlobalToLocalTableTaskFactory
mapGlobalToLocalTableTaskFactory;
+ public static EventAdmin eventAdmin;
}
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
