Author: ruschein
Date: 2011-03-24 14:22:29 -0700 (Thu, 24 Mar 2011)
New Revision: 24584
Modified:
core3/table-browser-impl/trunk/pom.xml
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/internal/BrowserTable.java
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/java/org/cytoscape/browser/ui/AttributeBrowserToolBar.java
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/ui/FormulaBuilderDialog.java
core3/table-browser-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
Log:
Updated to use the current version of equations-api.
Modified: core3/table-browser-impl/trunk/pom.xml
===================================================================
--- core3/table-browser-impl/trunk/pom.xml 2011-03-24 21:11:52 UTC (rev
24583)
+++ core3/table-browser-impl/trunk/pom.xml 2011-03-24 21:22:29 UTC (rev
24584)
@@ -135,7 +135,7 @@
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>equations-api</artifactId>
- <version>3.0.0-alpha1</version>
+ <version>3.0.0-alpha2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
Modified:
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/internal/BrowserTable.java
===================================================================
---
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/internal/BrowserTable.java
2011-03-24 21:11:52 UTC (rev 24583)
+++
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/internal/BrowserTable.java
2011-03-24 21:22:29 UTC (rev 24584)
@@ -50,12 +50,13 @@
import org.cytoscape.browser.ui.FormulaBuilderDialog;
import org.cytoscape.browser.util.HyperLinkOut;
-import org.cytoscape.equations.EqnCompiler;
+import org.cytoscape.equations.EquationCompiler;
import org.cytoscape.service.util.CyServiceRegistrar;
import org.cytoscape.util.swing.OpenBrowser;
import org.cytoscape.model.CyTable;
import org.cytoscape.model.CyColumn;
+
public class BrowserTable extends JTable
implements MouseListener, ActionListener, MouseMotionListener
{
@@ -74,10 +75,10 @@
private JMenuItem openFormulaBuilderMenuItem = null;
private final OpenBrowser openBrowser;
- private final EqnCompiler compiler;
+ private final EquationCompiler compiler;
private final PopupMenuHelper popupMenuHelper;
- public BrowserTable(final OpenBrowser openBrowser, final EqnCompiler
compiler,
+ public BrowserTable(final OpenBrowser openBrowser, final
EquationCompiler compiler,
final PopupMenuHelper popupMenuHelper)
{
this.openBrowser = openBrowser;
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-24 21:11:52 UTC (rev 24583)
+++
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/internal/BrowserTableModel.java
2011-03-24 21:22:29 UTC (rev 24584)
@@ -16,7 +16,7 @@
import javax.swing.event.TableModelEvent;
import javax.swing.event.TableModelEvent.*;
-import org.cytoscape.equations.EqnCompiler;
+import org.cytoscape.equations.EquationCompiler;
import org.cytoscape.equations.Equation;
import org.cytoscape.model.CyColumn;
import org.cytoscape.model.CyNetwork;
@@ -39,12 +39,12 @@
private static final int MAX_INITIALLY_VSIBLE_ATTRS = 10;
private final JTable table;
private final CyTable attrs;
- private final EqnCompiler compiler;
+ private final EquationCompiler compiler;
private final CyTableRowUpdateService tableRowUpdateService;
private boolean tableHasBooleanSelected;
private List<AttrNameAndVisibility> attrNamesAndVisibilities;
- public BrowserTableModel(final JTable table, final CyTable attrs, final
EqnCompiler compiler,
+ public BrowserTableModel(final JTable table, final CyTable attrs, final
EquationCompiler 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-24 21:11:52 UTC (rev 24583)
+++
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/internal/TableBrowser.java
2011-03-24 21:22:29 UTC (rev 24584)
@@ -16,7 +16,7 @@
import javax.swing.table.TableRowSorter;
import org.cytoscape.browser.ui.AttributeBrowserToolBar;
-import org.cytoscape.equations.EqnCompiler;
+import org.cytoscape.equations.EquationCompiler;
import org.cytoscape.event.CyEventHelper;
import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.model.CyTable;
@@ -42,7 +42,7 @@
{
private final CyTableManager tableManager;
private final CyServiceRegistrar serviceRegistrar;
- private final EqnCompiler compiler;
+ private final EquationCompiler compiler;
private final BrowserTable browserTable;
private final CyTableRowUpdateService tableRowUpdateService;
private final AttributeBrowserToolBar attributeBrowserToolBar;
@@ -53,7 +53,7 @@
private final GUITaskManager guiTaskManagerServiceRef;
TableBrowser(final CyTableManager tableManager, final
CyServiceRegistrar serviceRegistrar,
- final EqnCompiler compiler, final OpenBrowser openBrowser,
+ final EquationCompiler compiler, final OpenBrowser
openBrowser,
final CyNetworkManager networkManager,
final CyTableRowUpdateService tableRowUpdateService,
final TableTaskFactory deleteTableTaskFactoryService,
Modified:
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/ui/AttributeBrowserToolBar.java
===================================================================
---
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/ui/AttributeBrowserToolBar.java
2011-03-24 21:11:52 UTC (rev 24583)
+++
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/ui/AttributeBrowserToolBar.java
2011-03-24 21:22:29 UTC (rev 24584)
@@ -67,7 +67,7 @@
import org.cytoscape.browser.internal.AttributeListModel;
import org.cytoscape.browser.internal.BrowserTableModel;
-import org.cytoscape.equations.EqnCompiler;
+import org.cytoscape.equations.EquationCompiler;
import org.cytoscape.model.CyColumn;
import org.cytoscape.model.CyTable;
import org.cytoscape.model.CyTableManager;
@@ -112,13 +112,13 @@
private JButton importButton = null;
private AttributeListModel attrListModel;
- private final EqnCompiler compiler;
+ private final EquationCompiler compiler;
//private final CyTableManager tableManager;
private final TableTaskFactory deleteTableTaskFactoryService;
private final GUITaskManager guiTaskManagerServiceRef;
public AttributeBrowserToolBar(final CyServiceRegistrar
serviceRegistrar,
- final EqnCompiler compiler, final
+ final EquationCompiler compiler, final
TableTaskFactory
deleteTableTaskFactoryService,
GUITaskManager guiTaskManagerServiceRef)
{
Modified:
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/ui/FormulaBuilderDialog.java
===================================================================
---
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/ui/FormulaBuilderDialog.java
2011-03-24 21:11:52 UTC (rev 24583)
+++
core3/table-browser-impl/trunk/src/main/java/org/cytoscape/browser/ui/FormulaBuilderDialog.java
2011-03-24 21:22:29 UTC (rev 24584)
@@ -66,8 +66,8 @@
import org.cytoscape.equations.BooleanList;
import org.cytoscape.equations.DoubleList;
-import org.cytoscape.equations.EqnCompiler;
-import org.cytoscape.equations.EqnParser;
+import org.cytoscape.equations.EquationCompiler;
+import org.cytoscape.equations.EquationParser;
import org.cytoscape.equations.Equation;
import org.cytoscape.equations.EquationUtil;
import org.cytoscape.equations.Function;
@@ -110,11 +110,11 @@
private ArrayList<Class> leadingArgs;
private ApplicationDomain applicationDomain;
private Stack<Integer> undoStack;
- private final EqnCompiler compiler;
+ private final EquationCompiler compiler;
private final BrowserTableModel tableModel;
private final String targetAttrName;
- public FormulaBuilderDialog(final EqnCompiler compiler,
+ public FormulaBuilderDialog(final EquationCompiler compiler,
final BrowserTableModel tableModel, final
Frame parent,
final String targetAttrName)
{
@@ -159,7 +159,7 @@
}
});
- final EqnParser parser = compiler.getParser();
+ final EquationParser parser = compiler.getParser();
final Set<Function> functions = parser.getRegisteredFunctions();
final String[] functionNames = new String[functions.size()];
int index = 0;
@@ -330,7 +330,7 @@
for (final CyColumn column :
tableModel.getAttributes().getColumns())
attribNamesAndTypes.put(column.getName(),
column.getType());
- final EqnParser parser = compiler.getParser();
+ final EquationParser parser = compiler.getParser();
if (!parser.parse("=" + expression, attribNamesAndTypes)) {
displayErrorMessage(parser.getErrorMsg());
return null;
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-24 21:11:52 UTC (rev 24583)
+++
core3/table-browser-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-03-24 21:22:29 UTC (rev 24584)
@@ -8,7 +8,7 @@
<!-- imports -->
<osgi:reference id="cyTableManagerServiceRef"
interface="org.cytoscape.model.CyTableManager" />
<osgi:reference id="cyServiceRegistrarServiceRef"
interface="org.cytoscape.service.util.CyServiceRegistrar" />
- <osgi:reference id="compilerServiceRef"
interface="org.cytoscape.equations.EqnCompiler" />
+ <osgi:reference id="compilerServiceRef"
interface="org.cytoscape.equations.EquationCompiler" />
<osgi:reference id="openBrowserServiceRef"
interface="org.cytoscape.util.swing.OpenBrowser" />
<osgi:reference id="cyTableRowUpdateServiceRef"
interface="org.cytoscape.model.CyTableRowUpdateService" />
<osgi:reference id="cyNetworkManagerServiceRef"
interface="org.cytoscape.model.CyNetworkManager" />
--
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.
