Author: slotia
Date: 2012-08-09 18:26:35 -0700 (Thu, 09 Aug 2012)
New Revision: 30153
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/tunable/NetworkTableMappingParametersHandler.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/ui/NetworkImportOptionsPanel.java
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/util/CytoscapeServices.java
Log:
Removed all EventAdmin stuff
Modified: core3/impl/trunk/table-import-impl/pom.xml
===================================================================
--- core3/impl/trunk/table-import-impl/pom.xml 2012-08-10 01:05:06 UTC (rev
30152)
+++ core3/impl/trunk/table-import-impl/pom.xml 2012-08-10 01:26:35 UTC (rev
30153)
@@ -137,12 +137,6 @@
<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>
<groupId>org.apache.xmlbeans</groupId>
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-08-10 01:05:06 UTC (rev 30152)
+++
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/CyActivator.java
2012-08-10 01:26:35 UTC (rev 30153)
@@ -41,7 +41,6 @@
import org.osgi.framework.BundleContext;
-import org.osgi.service.event.EventAdmin;
import org.cytoscape.service.util.AbstractCyActivator;
@@ -78,7 +77,6 @@
CytoscapeServices.streamUtil = getService(bc,StreamUtil.class);
CytoscapeServices.cyEventHelper =
getService(bc,CyEventHelper.class);
CytoscapeServices.mapGlobalToLocalTableTaskFactory =
getService(bc, MapGlobalToLocalTableTaskFactory.class);
- CytoscapeServices.eventAdmin = getService(bc, EventAdmin.class);
BasicCyFileFilter attrsTableFilter_txt = new
BasicCyFileFilter(new String[]{"csv","tsv", "txt", "tab", "net"}, new
String[]{"text/csv","text/tab-separated-values"},"Comma or Tab Separated Value
Files",TABLE,CytoscapeServices.streamUtil);
BasicCyFileFilter attrsTableFilter_xls = new
BasicCyFileFilter(new String[]{"xls","xlsx"}, new
String[]{"application/excel"},"Excel Files",TABLE,CytoscapeServices.streamUtil);
Modified:
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/tunable/NetworkTableMappingParametersHandler.java
===================================================================
---
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/tunable/NetworkTableMappingParametersHandler.java
2012-08-10 01:05:06 UTC (rev 30152)
+++
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/tunable/NetworkTableMappingParametersHandler.java
2012-08-10 01:26:35 UTC (rev 30153)
@@ -20,7 +20,6 @@
import org.cytoscape.tableimport.internal.util.CytoscapeServices;
import org.cytoscape.util.swing.FileUtil;
-import org.osgi.service.event.Event;
import java.util.Map;
import java.util.HashMap;
@@ -69,9 +68,6 @@
new ImportTablePanel(dialogType, ntmp.is,
ntmp.fileType, null,null,
null, null,
null, null, null,
tableManager, fileUtil);
- final Map<String,String> props = new HashMap<String,String>();
- props.put("action", "show import table dialog");
- CytoscapeServices.eventAdmin.postEvent(new
Event("org/cytoscape/gettingstarted", props));
} catch (Exception e) {
throw new IllegalStateException("Could not initialize
ImportTablePanel.", e);
}
@@ -84,10 +80,6 @@
try{
ntmp =
importTablePanel.getNetworkTableMappingParameters();
setValue(ntmp);
-
- final Map<String,String> props = new HashMap<String,String>();
- props.put("action", "import table dialog ok");
- CytoscapeServices.eventAdmin.postEvent(new
Event("org/cytoscape/gettingstarted", props));
} catch (IllegalAccessException e) {
// TODO Auto-generated catch block
e.printStackTrace();
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-08-10 01:05:06 UTC (rev 30152)
+++
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/ui/ImportTablePanel.java
2012-08-10 01:26:35 UTC (rev 30153)
@@ -132,8 +132,6 @@
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;
@@ -234,7 +232,6 @@
private final CyNetworkManager manager;
private final CyTableFactory tableFactory;
private final CyTableManager tableManager;
- private final EventAdmin eventAdmin;
private File tempFile;
private final FileUtil fileUtil;
@@ -264,7 +261,6 @@
this.manager = manager;
this.tableFactory = tableFactory;
this.tableManager = tableManager;
- this.eventAdmin = CytoscapeServices.eventAdmin;
this.fileUtil = fileUtil;
if (dialogType != ONTOLOGY_AND_ANNOTATION_IMPORT) {
@@ -1592,9 +1588,6 @@
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/ui/NetworkImportOptionsPanel.java
===================================================================
---
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/ui/NetworkImportOptionsPanel.java
2012-08-10 01:05:06 UTC (rev 30152)
+++
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/ui/NetworkImportOptionsPanel.java
2012-08-10 01:26:35 UTC (rev 30153)
@@ -52,7 +52,6 @@
import javax.swing.JPanel;
import javax.swing.SwingConstants;
-import org.osgi.service.event.Event;
/**
* GUI Component for specify options for network table import.<br>
*
@@ -115,11 +114,6 @@
sourceComboBox.addActionListener(new
java.awt.event.ActionListener() {
public void
actionPerformed(java.awt.event.ActionEvent evt) {
networkColumnsComboBoxActionPerformed(evt);
-
- final Map<String,String> props = new
HashMap<String,String>();
- props.put("action", "set source interaction column");
- props.put("column", sourceComboBox.getSelectedItem() ==
null ? null : sourceComboBox.getSelectedItem().toString());
- CytoscapeServices.eventAdmin.postEvent(new
Event("org/cytoscape/gettingstarted", props));
}
});
@@ -146,11 +140,6 @@
targetComboBox.addActionListener(new
java.awt.event.ActionListener() {
public void
actionPerformed(java.awt.event.ActionEvent evt) {
networkColumnsComboBoxActionPerformed(evt);
-
- final Map<String,String> props = new
HashMap<String,String>();
- props.put("action", "set target
interaction column");
- props.put("column", targetComboBox.getSelectedItem() ==
null ? null : targetComboBox.getSelectedItem().toString());
- CytoscapeServices.eventAdmin.postEvent(new
Event("org/cytoscape/gettingstarted", props));
}
});
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-08-10 01:05:06 UTC (rev 30152)
+++
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/util/CytoscapeServices.java
2012-08-10 01:26:35 UTC (rev 30153)
@@ -20,7 +20,6 @@
import org.cytoscape.view.model.CyNetworkViewFactory;
import org.cytoscape.view.model.CyNetworkViewManager;
import org.cytoscape.work.swing.DialogTaskManager;
-import org.osgi.service.event.EventAdmin;
public class CytoscapeServices {
@@ -46,6 +45,5 @@
public static StreamUtil streamUtil;
public static CyEventHelper cyEventHelper;
public static MapGlobalToLocalTableTaskFactory
mapGlobalToLocalTableTaskFactory;
- public static EventAdmin eventAdmin;
public static InputStreamTaskFactory inputStreamTaskFactory;
}
--
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.
