Author: pwang
Date: 2011-03-09 17:01:23 -0800 (Wed, 09 Mar 2011)
New Revision: 24355
Added:
core3/table-import-impl/trunk/src/main/java/org/cytoscape/tableimport/internal/actions/ImportAttributeTableAction.javaX
core3/table-import-impl/trunk/src/main/java/org/cytoscape/tableimport/internal/actions/ImportNetworkTableAction.javaX
Removed:
core3/table-import-impl/trunk/src/main/java/org/cytoscape/tableimport/internal/actions/ImportAttributeTableAction.java
core3/table-import-impl/trunk/src/main/java/org/cytoscape/tableimport/internal/actions/ImportNetworkTableAction.java
Log:
Rename
Deleted:
core3/table-import-impl/trunk/src/main/java/org/cytoscape/tableimport/internal/actions/ImportAttributeTableAction.java
===================================================================
---
core3/table-import-impl/trunk/src/main/java/org/cytoscape/tableimport/internal/actions/ImportAttributeTableAction.java
2011-03-10 00:59:26 UTC (rev 24354)
+++
core3/table-import-impl/trunk/src/main/java/org/cytoscape/tableimport/internal/actions/ImportAttributeTableAction.java
2011-03-10 01:01:23 UTC (rev 24355)
@@ -1,77 +0,0 @@
-package org.cytoscape.tableimport.internal.actions;
-
-import java.awt.event.ActionEvent;
-import org.cytoscape.application.swing.AbstractCyAction;
-import org.cytoscape.application.swing.CySwingApplication;
-import org.cytoscape.property.CyProperty;
-import org.cytoscape.property.bookmark.Bookmarks;
-import org.cytoscape.property.bookmark.BookmarksUtil;
-import org.cytoscape.session.CyApplicationManager;
-import org.cytoscape.tableimport.internal.ui.ImportTextTableDialog;
-import org.cytoscape.work.swing.GUITaskManager;
-import java.io.IOException;
-import javax.xml.bind.JAXBException;
-
-import org.cytoscape.model.CyNetworkManager;
-import org.cytoscape.model.CyTableFactory;
-import org.cytoscape.model.CyTableManager;
-import org.cytoscape.tableimport.internal.util.CytoscapeServices;
-import org.cytoscape.util.swing.OpenBrowser;
-import org.cytoscape.util.swing.FileUtil;
-
-public class ImportAttributeTableAction extends AbstractCyAction {
- private final static long serialVersionUID = 1205339869460898L;
-
- /**
- * Creates a new ImportAttributeTableAction object.
- */
- public ImportAttributeTableAction(CySwingApplication
desktop,CyApplicationManager appMgr,
- CyNetworkManager netMgr,
- CyProperty<Bookmarks> bookmarksProp, BookmarksUtil
bookmarksUtil,
- GUITaskManager guiTaskManagerServiceRef, CyProperty
cytoscapePropertiesServiceRef,
- CyTableManager tblMgr, FileUtil fileUtilService,
OpenBrowser openBrowserService,
- CyTableFactory tableFactory)
-
- {
- super("Attribute from Table (Text/MS Excel)...", appMgr);
- setPreferredMenu("File.Import");
-
- //
- CytoscapeServices.desktop = desktop;
- CytoscapeServices.bookmarksUtil = bookmarksUtil;
- CytoscapeServices.cytoscapePropertiesServiceRef=
cytoscapePropertiesServiceRef;
- CytoscapeServices.guiTaskManagerServiceRef =
guiTaskManagerServiceRef;
- CytoscapeServices.tblMgr =tblMgr;
- CytoscapeServices.theBookmarks = bookmarksProp.getProperties();
- CytoscapeServices.openBrowser = openBrowserService;
- CytoscapeServices.fileUtil = fileUtilService;
- CytoscapeServices.appMgr = appMgr;
- CytoscapeServices.netMgr = netMgr;
- CytoscapeServices.tableFactory = tableFactory;
-
- }
-
- /**
- * DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
- */
- public void actionPerformed(ActionEvent e) {
-
- ImportTextTableDialog iad;
-
- try {
- iad = new
ImportTextTableDialog(CytoscapeServices.desktop.getJFrame(), true,
ImportTextTableDialog.SIMPLE_ATTRIBUTE_IMPORT);
- iad.pack();
-
iad.setLocationRelativeTo(CytoscapeServices.desktop.getJFrame());
- iad.setVisible(true);
- } catch (JAXBException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
- } catch (IOException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
- }
- }
-}
-
Added:
core3/table-import-impl/trunk/src/main/java/org/cytoscape/tableimport/internal/actions/ImportAttributeTableAction.javaX
===================================================================
---
core3/table-import-impl/trunk/src/main/java/org/cytoscape/tableimport/internal/actions/ImportAttributeTableAction.javaX
(rev 0)
+++
core3/table-import-impl/trunk/src/main/java/org/cytoscape/tableimport/internal/actions/ImportAttributeTableAction.javaX
2011-03-10 01:01:23 UTC (rev 24355)
@@ -0,0 +1,77 @@
+package org.cytoscape.tableimport.internal.actions;
+
+import java.awt.event.ActionEvent;
+import org.cytoscape.application.swing.AbstractCyAction;
+import org.cytoscape.application.swing.CySwingApplication;
+import org.cytoscape.property.CyProperty;
+import org.cytoscape.property.bookmark.Bookmarks;
+import org.cytoscape.property.bookmark.BookmarksUtil;
+import org.cytoscape.session.CyApplicationManager;
+import org.cytoscape.tableimport.internal.ui.ImportTextTableDialog;
+import org.cytoscape.work.swing.GUITaskManager;
+import java.io.IOException;
+import javax.xml.bind.JAXBException;
+
+import org.cytoscape.model.CyNetworkManager;
+import org.cytoscape.model.CyTableFactory;
+import org.cytoscape.model.CyTableManager;
+import org.cytoscape.tableimport.internal.util.CytoscapeServices;
+import org.cytoscape.util.swing.OpenBrowser;
+import org.cytoscape.util.swing.FileUtil;
+
+public class ImportAttributeTableAction extends AbstractCyAction {
+ private final static long serialVersionUID = 1205339869460898L;
+
+ /**
+ * Creates a new ImportAttributeTableAction object.
+ */
+ public ImportAttributeTableAction(CySwingApplication
desktop,CyApplicationManager appMgr,
+ CyNetworkManager netMgr,
+ CyProperty<Bookmarks> bookmarksProp, BookmarksUtil
bookmarksUtil,
+ GUITaskManager guiTaskManagerServiceRef, CyProperty
cytoscapePropertiesServiceRef,
+ CyTableManager tblMgr, FileUtil fileUtilService,
OpenBrowser openBrowserService,
+ CyTableFactory tableFactory)
+
+ {
+ super("Attribute from Table (Text/MS Excel)...", appMgr);
+ setPreferredMenu("File.Import");
+
+ //
+ CytoscapeServices.desktop = desktop;
+ CytoscapeServices.bookmarksUtil = bookmarksUtil;
+ CytoscapeServices.cytoscapePropertiesServiceRef=
cytoscapePropertiesServiceRef;
+ CytoscapeServices.guiTaskManagerServiceRef =
guiTaskManagerServiceRef;
+ CytoscapeServices.tblMgr =tblMgr;
+ CytoscapeServices.theBookmarks = bookmarksProp.getProperties();
+ CytoscapeServices.openBrowser = openBrowserService;
+ CytoscapeServices.fileUtil = fileUtilService;
+ CytoscapeServices.appMgr = appMgr;
+ CytoscapeServices.netMgr = netMgr;
+ CytoscapeServices.tableFactory = tableFactory;
+
+ }
+
+ /**
+ * DOCUMENT ME!
+ *
+ * @param e DOCUMENT ME!
+ */
+ public void actionPerformed(ActionEvent e) {
+
+ ImportTextTableDialog iad;
+
+ try {
+ iad = new
ImportTextTableDialog(CytoscapeServices.desktop.getJFrame(), true,
ImportTextTableDialog.SIMPLE_ATTRIBUTE_IMPORT);
+ iad.pack();
+
iad.setLocationRelativeTo(CytoscapeServices.desktop.getJFrame());
+ iad.setVisible(true);
+ } catch (JAXBException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ } catch (IOException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ }
+ }
+}
+
Deleted:
core3/table-import-impl/trunk/src/main/java/org/cytoscape/tableimport/internal/actions/ImportNetworkTableAction.java
===================================================================
---
core3/table-import-impl/trunk/src/main/java/org/cytoscape/tableimport/internal/actions/ImportNetworkTableAction.java
2011-03-10 00:59:26 UTC (rev 24354)
+++
core3/table-import-impl/trunk/src/main/java/org/cytoscape/tableimport/internal/actions/ImportNetworkTableAction.java
2011-03-10 01:01:23 UTC (rev 24355)
@@ -1,126 +0,0 @@
-
-/*
- Copyright (c) 2006, 2007, The Cytoscape Consortium (www.cytoscape.org)
-
- The Cytoscape Consortium is:
- - Institute for Systems Biology
- - University of California San Diego
- - Memorial Sloan-Kettering Cancer Center
- - Institut Pasteur
- - Agilent Technologies
-
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published
- by the Free Software Foundation; either version 2.1 of the License, or
- any later version.
-
- This library is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF
- MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. The software and
- documentation provided hereunder is on an "as is" basis, and the
- Institute for Systems Biology and the Whitehead Institute
- have no obligations to provide maintenance, support,
- updates, enhancements or modifications. In no event shall the
- Institute for Systems Biology and the Whitehead Institute
- be liable to any party for direct, indirect, special,
- incidental or consequential damages, including lost profits, arising
- out of the use of this software and its documentation, even if the
- Institute for Systems Biology and the Whitehead Institute
- have been advised of the possibility of such damage. See
- the GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with this library; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-*/
-
-package org.cytoscape.tableimport.internal.actions;
-
-
-import org.cytoscape.application.swing.AbstractCyAction;
-import org.cytoscape.application.swing.CySwingApplication;
-import org.cytoscape.model.CyNetworkManager;
-import org.cytoscape.model.CyTableManager;
-import org.cytoscape.property.CyProperty;
-import org.cytoscape.property.bookmark.Bookmarks;
-import org.cytoscape.property.bookmark.BookmarksUtil;
-import org.cytoscape.session.CyApplicationManager;
-import org.cytoscape.session.CyNetworkNaming;
-import org.cytoscape.tableimport.internal.ui.ImportTextTableDialog;
-import org.cytoscape.tableimport.internal.util.CytoscapeServices;
-import org.cytoscape.util.swing.FileUtil;
-import org.cytoscape.util.swing.OpenBrowser;
-import org.cytoscape.work.swing.GUITaskManager;
-
-import java.awt.event.ActionEvent;
-import java.io.IOException;
-import javax.xml.bind.JAXBException;
-import org.cytoscape.view.layout.CyLayouts;
-import org.cytoscape.model.CyNetworkFactory;
-import org.cytoscape.view.model.CyNetworkViewFactory;
-import org.cytoscape.view.model.CyNetworkViewManager;
-
-
-/**
- *
- */
-public class ImportNetworkTableAction extends AbstractCyAction {
-
- private final static long serialVersionUID = 1205939869461298L;
- /**
- * Creates a new ImportNetworkTableAction object.
- */
- public ImportNetworkTableAction(CySwingApplication
desktop,CyApplicationManager appMgr,
- CyNetworkManager netMgr,
- CyProperty<Bookmarks> bookmarksProp, BookmarksUtil
bookmarksUtil,
- GUITaskManager guiTaskManagerServiceRef, CyProperty
cytoscapePropertiesServiceRef,
- CyTableManager tblMgr, FileUtil fileUtilService,
OpenBrowser openBrowserService,
- CyLayouts cyLayoutsServiceRef, CyNetworkViewFactory
cyNetworkViewFactoryServiceRef,
- CyNetworkFactory cyNetworkFactoryServiceRef,
- CyNetworkViewManager networkViewManager,CyNetworkNaming
cyNetworkNaming)
- {
- super("Network from Table (Text/MS Excel)...", appMgr);
- setPreferredMenu("File.Import");
-
- //
- CytoscapeServices.desktop = desktop;
- CytoscapeServices.bookmarksUtil = bookmarksUtil;
- CytoscapeServices.cytoscapePropertiesServiceRef=
cytoscapePropertiesServiceRef;
- CytoscapeServices.guiTaskManagerServiceRef =
guiTaskManagerServiceRef;
- CytoscapeServices.tblMgr =tblMgr;
- CytoscapeServices.theBookmarks = bookmarksProp.getProperties();
- CytoscapeServices.openBrowser = openBrowserService;
- CytoscapeServices.fileUtil = fileUtilService;
- CytoscapeServices.appMgr = appMgr;
- CytoscapeServices.netMgr = netMgr;
-
- CytoscapeServices.cyLayoutsServiceRef= cyLayoutsServiceRef;
- CytoscapeServices.cyNetworkViewFactoryServiceRef =
cyNetworkViewFactoryServiceRef;
- CytoscapeServices.cyNetworkFactoryServiceRef =
cyNetworkFactoryServiceRef;
- CytoscapeServices.networkViewManager = networkViewManager;
- CytoscapeServices.cyNetworkNaming = cyNetworkNaming;
- }
-
- /**
- * DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
- */
- @Override
- public void actionPerformed(ActionEvent e) {
- ImportTextTableDialog iad;
-
- try {
- iad = new
ImportTextTableDialog(CytoscapeServices.desktop.getJFrame(), true,
ImportTextTableDialog.NETWORK_IMPORT);
- iad.pack();
-
iad.setLocationRelativeTo(CytoscapeServices.desktop.getJFrame());
- iad.setVisible(true);
- } catch (JAXBException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
- } catch (IOException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
- }
- }
-}
Added:
core3/table-import-impl/trunk/src/main/java/org/cytoscape/tableimport/internal/actions/ImportNetworkTableAction.javaX
===================================================================
---
core3/table-import-impl/trunk/src/main/java/org/cytoscape/tableimport/internal/actions/ImportNetworkTableAction.javaX
(rev 0)
+++
core3/table-import-impl/trunk/src/main/java/org/cytoscape/tableimport/internal/actions/ImportNetworkTableAction.javaX
2011-03-10 01:01:23 UTC (rev 24355)
@@ -0,0 +1,126 @@
+
+/*
+ Copyright (c) 2006, 2007, The Cytoscape Consortium (www.cytoscape.org)
+
+ The Cytoscape Consortium is:
+ - Institute for Systems Biology
+ - University of California San Diego
+ - Memorial Sloan-Kettering Cancer Center
+ - Institut Pasteur
+ - Agilent Technologies
+
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2.1 of the License, or
+ any later version.
+
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF
+ MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. The software and
+ documentation provided hereunder is on an "as is" basis, and the
+ Institute for Systems Biology and the Whitehead Institute
+ have no obligations to provide maintenance, support,
+ updates, enhancements or modifications. In no event shall the
+ Institute for Systems Biology and the Whitehead Institute
+ be liable to any party for direct, indirect, special,
+ incidental or consequential damages, including lost profits, arising
+ out of the use of this software and its documentation, even if the
+ Institute for Systems Biology and the Whitehead Institute
+ have been advised of the possibility of such damage. See
+ the GNU Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, write to the Free Software Foundation,
+ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+*/
+
+package org.cytoscape.tableimport.internal.actions;
+
+
+import org.cytoscape.application.swing.AbstractCyAction;
+import org.cytoscape.application.swing.CySwingApplication;
+import org.cytoscape.model.CyNetworkManager;
+import org.cytoscape.model.CyTableManager;
+import org.cytoscape.property.CyProperty;
+import org.cytoscape.property.bookmark.Bookmarks;
+import org.cytoscape.property.bookmark.BookmarksUtil;
+import org.cytoscape.session.CyApplicationManager;
+import org.cytoscape.session.CyNetworkNaming;
+import org.cytoscape.tableimport.internal.ui.ImportTextTableDialog;
+import org.cytoscape.tableimport.internal.util.CytoscapeServices;
+import org.cytoscape.util.swing.FileUtil;
+import org.cytoscape.util.swing.OpenBrowser;
+import org.cytoscape.work.swing.GUITaskManager;
+
+import java.awt.event.ActionEvent;
+import java.io.IOException;
+import javax.xml.bind.JAXBException;
+import org.cytoscape.view.layout.CyLayouts;
+import org.cytoscape.model.CyNetworkFactory;
+import org.cytoscape.view.model.CyNetworkViewFactory;
+import org.cytoscape.view.model.CyNetworkViewManager;
+
+
+/**
+ *
+ */
+public class ImportNetworkTableAction extends AbstractCyAction {
+
+ private final static long serialVersionUID = 1205939869461298L;
+ /**
+ * Creates a new ImportNetworkTableAction object.
+ */
+ public ImportNetworkTableAction(CySwingApplication
desktop,CyApplicationManager appMgr,
+ CyNetworkManager netMgr,
+ CyProperty<Bookmarks> bookmarksProp, BookmarksUtil
bookmarksUtil,
+ GUITaskManager guiTaskManagerServiceRef, CyProperty
cytoscapePropertiesServiceRef,
+ CyTableManager tblMgr, FileUtil fileUtilService,
OpenBrowser openBrowserService,
+ CyLayouts cyLayoutsServiceRef, CyNetworkViewFactory
cyNetworkViewFactoryServiceRef,
+ CyNetworkFactory cyNetworkFactoryServiceRef,
+ CyNetworkViewManager networkViewManager,CyNetworkNaming
cyNetworkNaming)
+ {
+ super("Network from Table (Text/MS Excel)...", appMgr);
+ setPreferredMenu("File.Import");
+
+ //
+ CytoscapeServices.desktop = desktop;
+ CytoscapeServices.bookmarksUtil = bookmarksUtil;
+ CytoscapeServices.cytoscapePropertiesServiceRef=
cytoscapePropertiesServiceRef;
+ CytoscapeServices.guiTaskManagerServiceRef =
guiTaskManagerServiceRef;
+ CytoscapeServices.tblMgr =tblMgr;
+ CytoscapeServices.theBookmarks = bookmarksProp.getProperties();
+ CytoscapeServices.openBrowser = openBrowserService;
+ CytoscapeServices.fileUtil = fileUtilService;
+ CytoscapeServices.appMgr = appMgr;
+ CytoscapeServices.netMgr = netMgr;
+
+ CytoscapeServices.cyLayoutsServiceRef= cyLayoutsServiceRef;
+ CytoscapeServices.cyNetworkViewFactoryServiceRef =
cyNetworkViewFactoryServiceRef;
+ CytoscapeServices.cyNetworkFactoryServiceRef =
cyNetworkFactoryServiceRef;
+ CytoscapeServices.networkViewManager = networkViewManager;
+ CytoscapeServices.cyNetworkNaming = cyNetworkNaming;
+ }
+
+ /**
+ * DOCUMENT ME!
+ *
+ * @param e DOCUMENT ME!
+ */
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ ImportTextTableDialog iad;
+
+ try {
+ iad = new
ImportTextTableDialog(CytoscapeServices.desktop.getJFrame(), true,
ImportTextTableDialog.NETWORK_IMPORT);
+ iad.pack();
+
iad.setLocationRelativeTo(CytoscapeServices.desktop.getJFrame());
+ iad.setVisible(true);
+ } catch (JAXBException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ } catch (IOException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ }
+ }
+}
--
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.
