Author: ruschein
Date: 2010-12-09 16:35:28 -0800 (Thu, 09 Dec 2010)
New Revision: 23157
Added:
core3/table-browser-impl/branches/experiment1/src/main/java/org/cytoscape/browser/internal/BrowserTableModel.java
Modified:
core3/table-browser-impl/branches/experiment1/pom.xml
core3/table-browser-impl/branches/experiment1/src/main/java/org/cytoscape/browser/internal/BrowserTable.java
core3/table-browser-impl/branches/experiment1/src/main/java/org/cytoscape/browser/internal/TableBrowser.java
core3/table-browser-impl/branches/experiment1/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/table-browser-impl/branches/experiment1/src/main/resources/META-INF/spring/bundle-context.xml
Log:
Work in progress.
Modified: core3/table-browser-impl/branches/experiment1/pom.xml
===================================================================
--- core3/table-browser-impl/branches/experiment1/pom.xml 2010-12-09
23:07:11 UTC (rev 23156)
+++ core3/table-browser-impl/branches/experiment1/pom.xml 2010-12-10
00:35:28 UTC (rev 23157)
@@ -88,5 +88,10 @@
<artifactId>swing-application-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>service-util</artifactId>
+ <version>3.0.0-alpha2-SNAPSHOT</version>
+ </dependency>
</dependencies>
</project>
Modified:
core3/table-browser-impl/branches/experiment1/src/main/java/org/cytoscape/browser/internal/BrowserTable.java
===================================================================
---
core3/table-browser-impl/branches/experiment1/src/main/java/org/cytoscape/browser/internal/BrowserTable.java
2010-12-09 23:07:11 UTC (rev 23156)
+++
core3/table-browser-impl/branches/experiment1/src/main/java/org/cytoscape/browser/internal/BrowserTable.java
2010-12-10 00:35:28 UTC (rev 23157)
@@ -3,6 +3,11 @@
import javax.swing.JTable;
+import org.cytoscape.service.util.CyServiceRegistrar;
+
public class BrowserTable extends JTable {
+ public BrowserTable() {
+ super(10, 10);
+ }
}
Added:
core3/table-browser-impl/branches/experiment1/src/main/java/org/cytoscape/browser/internal/BrowserTableModel.java
===================================================================
---
core3/table-browser-impl/branches/experiment1/src/main/java/org/cytoscape/browser/internal/BrowserTableModel.java
(rev 0)
+++
core3/table-browser-impl/branches/experiment1/src/main/java/org/cytoscape/browser/internal/BrowserTableModel.java
2010-12-10 00:35:28 UTC (rev 23157)
@@ -0,0 +1,39 @@
+package org.cytoscape.browser.internal;
+
+
+import javax.swing.table.AbstractTableModel;
+
+import org.cytoscape.model.CyTable;
+import org.cytoscape.model.events.ColumnCreatedEvent;
+import org.cytoscape.model.events.ColumnCreatedListener;
+import org.cytoscape.model.events.ColumnDeletedEvent;
+import org.cytoscape.model.events.ColumnDeletedListener;
+
+
+public class BrowserTableModel extends AbstractTableModel
+ implements ColumnCreatedListener, ColumnDeletedListener
+{
+ private final CyTable table;
+
+ public BrowserTableModel(final CyTable table) {
+ this.table = table;
+ }
+
+ public int getRowCount() {
+ return 10;
+ }
+
+ public int getColumnCount() {
+ return 10;
+ }
+
+ public Object getValueAt(int row, int column) {
+ return row + "," + column;
+ }
+
+ public void handleEvent(final ColumnCreatedEvent e) {
+ }
+
+ public void handleEvent(final ColumnDeletedEvent e) {
+ }
+}
Modified:
core3/table-browser-impl/branches/experiment1/src/main/java/org/cytoscape/browser/internal/TableBrowser.java
===================================================================
---
core3/table-browser-impl/branches/experiment1/src/main/java/org/cytoscape/browser/internal/TableBrowser.java
2010-12-09 23:07:11 UTC (rev 23156)
+++
core3/table-browser-impl/branches/experiment1/src/main/java/org/cytoscape/browser/internal/TableBrowser.java
2010-12-10 00:35:28 UTC (rev 23157)
@@ -4,26 +4,38 @@
import java.awt.Component;
import java.awt.event.ActionListener;
import java.awt.event.ActionEvent;
+import java.util.Properties;
import javax.swing.JPanel;
import javax.swing.Icon;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
import org.cytoscape.model.CyTable;
import org.cytoscape.model.CyTableManager;
import org.cytoscape.application.swing.CytoPanelComponent;
import org.cytoscape.application.swing.CytoPanelName;
+import org.cytoscape.service.util.CyServiceRegistrar;
@SuppressWarnings("serial")
public class TableBrowser extends JPanel implements CytoPanelComponent,
ActionListener {
private final CyTableManager tableManager;
+ private final CyServiceRegistrar serviceRegistrar;
+ private final BrowserTable browserTable;
+ private BrowserTableModel browserTableModel;
+ private CyTable currentTable;
- TableBrowser(final CyTableManager tableManager) {
+ TableBrowser(final CyTableManager tableManager, final
CyServiceRegistrar serviceRegistrar) {
this.tableManager = tableManager;
+ this.serviceRegistrar = serviceRegistrar;
+ this.browserTable = new BrowserTable();
+ browserTable.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
final TableChooser tableChooser = new
TableChooser(tableManager);
tableChooser.addActionListener(this);
add(tableChooser);
+ add(new JScrollPane(browserTable));
}
/**
@@ -44,7 +56,7 @@
* Returns the title of the tab within the CytoPanel for this component.
* @return the title of the tab within the CytoPanel for this component.
*/
- public String getTitle() { return "Table Browser"; }
+ public String getTitle() { return null; }
/**
* @return null
@@ -54,7 +66,13 @@
public void actionPerformed(ActionEvent e) {
final TableChooser tableChooser = (TableChooser)e.getSource();
final CyTable table = (CyTable)tableChooser.getSelectedItem();
- if (table != null)
-
System.err.println("****************************************************
selected table = "+table.getTitle());
+ if (table != null && table != currentTable) {
+ currentTable = table;
+ if (browserTableModel != null)
+
serviceRegistrar.unregisterAllServices(browserTableModel);
+ browserTableModel = new BrowserTableModel(table);
+ serviceRegistrar.registerAllServices(browserTableModel,
new Properties());
+ browserTable.setModel(browserTableModel);
+ }
}
}
\ No newline at end of file
Modified:
core3/table-browser-impl/branches/experiment1/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/table-browser-impl/branches/experiment1/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2010-12-09 23:07:11 UTC (rev 23156)
+++
core3/table-browser-impl/branches/experiment1/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2010-12-10 00:35:28 UTC (rev 23157)
@@ -7,6 +7,8 @@
<osgi:reference id="cyTableManagerServiceRef"
interface="org.cytoscape.model.CyTableManager">
</osgi:reference>
+ <osgi:reference id="cyServiceRegistrarServiceRef"
interface="org.cytoscape.service.util.CyServiceRegistrar">
+ </osgi:reference>
<osgi:service id="tableBrowserCytoPanelComponentService"
ref="tableBrowser"
interface="org.cytoscape.application.swing.CytoPanelComponent"/>
Modified:
core3/table-browser-impl/branches/experiment1/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/table-browser-impl/branches/experiment1/src/main/resources/META-INF/spring/bundle-context.xml
2010-12-09 23:07:11 UTC (rev 23156)
+++
core3/table-browser-impl/branches/experiment1/src/main/resources/META-INF/spring/bundle-context.xml
2010-12-10 00:35:28 UTC (rev 23157)
@@ -27,5 +27,6 @@
<bean id="tableBrowser"
class="org.cytoscape.browser.internal.TableBrowser">
<constructor-arg ref="cyTableManagerServiceRef" />
+ <constructor-arg ref="cyServiceRegistrarServiceRef" />
</bean>
</beans>
--
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.
