Author: ruschein
Date: 2011-03-03 14:05:50 -0800 (Thu, 03 Mar 2011)
New Revision: 24305
Modified:
core3/table-browser-impl/trunk/pom.xml
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/internal/BrowserTableModel.java
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/internal/TableBrowser.java
core3/table-browser-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/table-browser-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
Log:
Removed unused dependency on CyEventHelper.
Modified: core3/table-browser-impl/trunk/pom.xml
===================================================================
--- core3/table-browser-impl/trunk/pom.xml 2011-03-03 20:12:42 UTC (rev
24304)
+++ core3/table-browser-impl/trunk/pom.xml 2011-03-03 22:05:50 UTC (rev
24305)
@@ -49,6 +49,22 @@
</instructions>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.cytoscape.mavenplugins</groupId>
+
<artifactId>cytoscape-profiler-maven-plugin</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <phase>test</phase>
+ <goals>
+ <goal>profiler</goal>
+ </goals>
+ <configuration>
+
<baselineVersion>3.0.0-alpha1</baselineVersion>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
@@ -98,11 +114,6 @@
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>event-api</artifactId>
- <version>3.0.0-alpha3</version>
- </dependency>
- <dependency>
- <groupId>org.cytoscape</groupId>
<artifactId>equations-api</artifactId>
<version>3.0.0-alpha1</version>
</dependency>
Modified:
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/internal/BrowserTableModel.java
===================================================================
---
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/internal/BrowserTableModel.java
2011-03-03 20:12:42 UTC (rev 24304)
+++
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/internal/BrowserTableModel.java
2011-03-03 22:05:50 UTC (rev 24305)
@@ -18,7 +18,6 @@
import org.cytoscape.equations.EqnCompiler;
import org.cytoscape.equations.Equation;
-import org.cytoscape.event.CyEventHelper;
import org.cytoscape.model.CyColumn;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyRow;
@@ -31,7 +30,6 @@
import org.cytoscape.model.events.ColumnNameChangedEvent;
import org.cytoscape.model.events.ColumnNameChangedListener;
import org.cytoscape.model.events.CyTableRowUpdateMicroListener;
-import org.cytoscape.service.util.CyServiceRegistrar;
public final class BrowserTableModel extends AbstractTableModel
@@ -46,9 +44,7 @@
private boolean tableHasBooleanSelected;
private List<AttrNameAndVisibility> attrNamesAndVisibilities;
- public BrowserTableModel(final JTable table, final CyEventHelper
eventHelper,
- final CyTable attrs, final EqnCompiler
compiler,
- final CyServiceRegistrar serviceRegistrar,
+ public BrowserTableModel(final JTable table, final CyTable attrs, final
EqnCompiler compiler,
final CyTableRowUpdateService
tableRowUpdateService)
{
this.table = table;
Modified:
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/internal/TableBrowser.java
===================================================================
---
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/internal/TableBrowser.java
2011-03-03 20:12:42 UTC (rev 24304)
+++
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/internal/TableBrowser.java
2011-03-03 22:05:50 UTC (rev 24305)
@@ -42,7 +42,6 @@
{
private final CyTableManager tableManager;
private final CyServiceRegistrar serviceRegistrar;
- private final CyEventHelper eventHelper;
private final EqnCompiler compiler;
private final BrowserTable browserTable;
private final CyTableRowUpdateService tableRowUpdateService;
@@ -54,8 +53,8 @@
private final GUITaskManager guiTaskManagerServiceRef;
TableBrowser(final CyTableManager tableManager, final
CyServiceRegistrar serviceRegistrar,
- final CyEventHelper eventHelper, final EqnCompiler
compiler,
- final OpenBrowser openBrowser, final CyNetworkManager
networkManager,
+ final EqnCompiler compiler, final OpenBrowser openBrowser,
+ final CyNetworkManager networkManager,
final CyTableRowUpdateService tableRowUpdateService,
final TableTaskFactory deleteTableTaskFactoryService,
final GUITaskManager guiTaskManagerServiceRef,
@@ -63,7 +62,6 @@
{
this.tableManager = tableManager;
this.serviceRegistrar = serviceRegistrar;
- this.eventHelper = eventHelper;
this.compiler = compiler;
this.deleteTableTaskFactoryService =
deleteTableTaskFactoryService;
@@ -130,8 +128,7 @@
}
currentTable = table;
- browserTableModel = new BrowserTableModel(browserTable,
eventHelper, table,
- compiler,
serviceRegistrar,
+ browserTableModel = new BrowserTableModel(browserTable,
table, compiler,
tableRowUpdateService);
serviceRegistrar.registerAllServices(browserTableModel,
new Properties());
browserTable.setModel(browserTableModel);
Modified:
core3/table-browser-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/table-browser-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-03-03 20:12:42 UTC (rev 24304)
+++
core3/table-browser-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-03-03 22:05:50 UTC (rev 24305)
@@ -8,7 +8,6 @@
<!-- imports -->
<osgi:reference id="cyTableManagerServiceRef"
interface="org.cytoscape.model.CyTableManager" />
<osgi:reference id="cyServiceRegistrarServiceRef"
interface="org.cytoscape.service.util.CyServiceRegistrar" />
- <osgi:reference id="cyEventHelperServiceRef"
interface="org.cytoscape.event.CyEventHelper" />
<osgi:reference id="compilerServiceRef"
interface="org.cytoscape.equations.EqnCompiler" />
<osgi:reference id="openBrowserServiceRef"
interface="org.cytoscape.util.swing.OpenBrowser" />
<osgi:reference id="cyTableRowUpdateServiceRef"
interface="org.cytoscape.model.CyTableRowUpdateService" />
@@ -20,7 +19,7 @@
<!-- listeners -->
<osgi:service id="tableBrowserCytoPanelComponentService"
ref="tableBrowser">
<osgi:interfaces>
-
<value>org.cytoscape.application.swing.CytoPanelComponent</value>
+
<value>org.cytoscape.application.swing.CytoPanelComponent</value>
<value>org.cytoscape.view.model.events.NetworkViewAddedListener</value>
<value>org.cytoscape.model.events.TableAboutToBeDeletedListener</value>
</osgi:interfaces>
Modified:
core3/table-browser-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/table-browser-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-03-03 20:12:42 UTC (rev 24304)
+++
core3/table-browser-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-03-03 22:05:50 UTC (rev 24305)
@@ -28,7 +28,6 @@
<bean id="tableBrowser"
class="org.cytoscape.browser.internal.TableBrowser">
<constructor-arg ref="cyTableManagerServiceRef" />
<constructor-arg ref="cyServiceRegistrarServiceRef" />
- <constructor-arg ref="cyEventHelperServiceRef" />
<constructor-arg ref="compilerServiceRef" />
<constructor-arg ref="openBrowserServiceRef" />
<constructor-arg ref="cyNetworkManagerServiceRef" />
--
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.
