Author: paperwing
Date: 2012-04-23 11:46:35 -0700 (Mon, 23 Apr 2012)
New Revision: 28947
Removed:
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/ui/InstallAppsPanel.java
Modified:
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/CyActivator.java
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/CyAppAdapterImpl.java
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/event/AppsChangedEvent.java
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/manager/AppManager.java
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/manager/AppParser.java
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/manager/BundleApp.java
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/manager/SimpleApp.java
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/ui/CheckForUpdatesPanel.java
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/ui/CurrentlyInstalledAppsPanel.java
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/ui/InstallFromStorePanel.java
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/ui/InstallFromStorePanelOld.java
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/test/java/org/cytoscape/app/internal/CyAppAdapterImplTest.java
Log:
Cleaned up unused imports, updated reference to
org.cytoscape.io.datasource.DataSourceManager to reflect recent Cytoscape
refactoring, removed class for the unused 4th "Install Directly" tab
Modified:
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/CyActivator.java
===================================================================
---
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/CyActivator.java
2012-04-23 18:38:12 UTC (rev 28946)
+++
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/CyActivator.java
2012-04-23 18:46:35 UTC (rev 28947)
@@ -19,7 +19,7 @@
import org.cytoscape.model.CyTableFactory;
import org.cytoscape.util.swing.FileUtil;
import org.cytoscape.view.layout.CyLayoutAlgorithmManager;
-import org.cytoscape.datasource.DataSourceManager;
+import org.cytoscape.io.datasource.DataSourceManager;
import org.cytoscape.event.CyEventHelper;
import org.cytoscape.io.util.StreamUtil;
import org.cytoscape.io.write.PresentationWriterManager;
Modified:
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/CyAppAdapterImpl.java
===================================================================
---
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/CyAppAdapterImpl.java
2012-04-23 18:38:12 UTC (rev 28946)
+++
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/CyAppAdapterImpl.java
2012-04-23 18:46:35 UTC (rev 28947)
@@ -10,7 +10,7 @@
import org.cytoscape.application.swing.CyAction;
import org.cytoscape.application.swing.CySwingApplication;
import org.cytoscape.application.swing.events.CytoPanelComponentSelectedEvent;
-import org.cytoscape.datasource.DataSourceManager;
+import org.cytoscape.io.datasource.DataSourceManager;
import org.cytoscape.equations.AbstractFunction;
import org.cytoscape.event.CyEventHelper;
import org.cytoscape.io.CyFileFilter;
Modified:
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/event/AppsChangedEvent.java
===================================================================
---
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/event/AppsChangedEvent.java
2012-04-23 18:38:12 UTC (rev 28946)
+++
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/event/AppsChangedEvent.java
2012-04-23 18:46:35 UTC (rev 28947)
@@ -1,8 +1,6 @@
package org.cytoscape.app.internal.event;
-import org.cytoscape.app.internal.manager.App;
import org.cytoscape.app.internal.manager.AppManager;
-import org.cytoscape.event.AbstractCyEvent;
/**
* An event used by the {@link AppManager} to notify AppsChangedListeners that
an app has
Modified:
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/manager/AppManager.java
===================================================================
---
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/manager/AppManager.java
2012-04-23 18:38:12 UTC (rev 28946)
+++
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/manager/AppManager.java
2012-04-23 18:46:35 UTC (rev 28947)
@@ -2,28 +2,17 @@
import java.io.File;
import java.io.IOException;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
-import java.util.jar.JarFile;
-
-import javax.swing.SwingUtilities;
-
import org.apache.commons.io.FileUtils;
import org.cytoscape.app.AbstractCyApp;
import org.cytoscape.app.CyAppAdapter;
import org.cytoscape.app.internal.event.AppsChangedEvent;
import org.cytoscape.app.internal.event.AppsChangedListener;
import org.cytoscape.app.internal.exception.AppInstallException;
-import org.cytoscape.app.internal.exception.AppMoveException;
import org.cytoscape.app.internal.exception.AppParsingException;
import org.cytoscape.app.internal.exception.AppUninstallException;
-import org.cytoscape.app.internal.manager.App.AppStatus;
import org.cytoscape.app.internal.net.WebQuerier;
import org.cytoscape.application.CyApplicationConfiguration;
Modified:
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/manager/AppParser.java
===================================================================
---
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/manager/AppParser.java
2012-04-23 18:38:12 UTC (rev 28946)
+++
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/manager/AppParser.java
2012-04-23 18:46:35 UTC (rev 28947)
@@ -2,8 +2,6 @@
import java.io.File;
import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
import java.util.jar.JarFile;
import java.util.jar.Manifest;
Modified:
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/manager/BundleApp.java
===================================================================
---
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/manager/BundleApp.java
2012-04-23 18:38:12 UTC (rev 28946)
+++
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/manager/BundleApp.java
2012-04-23 18:46:35 UTC (rev 28947)
@@ -17,9 +17,9 @@
throws AppInstanceException {
BundleContext bundleContext = null;
- Bundle bundle;
+ Bundle bundle = null;
try {
- bundle =
bundleContext.installBundle(this.getAppFile().toURL().toString());
+ bundle =
bundleContext.installBundle(this.getAppFile().toURI().toURL().toString());
} catch (MalformedURLException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -27,6 +27,8 @@
// TODO Auto-generated catch block
e.printStackTrace();
}
+
+ return bundle;
}
@Override
Modified:
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/manager/SimpleApp.java
===================================================================
---
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/manager/SimpleApp.java
2012-04-23 18:38:12 UTC (rev 28946)
+++
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/manager/SimpleApp.java
2012-04-23 18:46:35 UTC (rev 28947)
@@ -1,23 +1,16 @@
package org.cytoscape.app.internal.manager;
import java.io.File;
-import java.io.IOException;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
-import org.apache.commons.io.FileUtils;
-import org.cytoscape.app.AbstractCyApp;
import org.cytoscape.app.CyAppAdapter;
-import org.cytoscape.app.internal.event.AppsChangedEvent;
-import org.cytoscape.app.internal.event.AppsChangedListener;
import org.cytoscape.app.internal.exception.AppInstallException;
import org.cytoscape.app.internal.exception.AppInstanceException;
-import org.cytoscape.app.internal.exception.AppMoveException;
import org.cytoscape.app.internal.exception.AppUninstallException;
-import org.cytoscape.app.internal.manager.App.AppStatus;
public class SimpleApp extends App {
Modified:
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/ui/CheckForUpdatesPanel.java
===================================================================
---
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/ui/CheckForUpdatesPanel.java
2012-04-23 18:38:12 UTC (rev 28946)
+++
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/ui/CheckForUpdatesPanel.java
2012-04-23 18:46:35 UTC (rev 28947)
@@ -1,12 +1,5 @@
package org.cytoscape.app.internal.ui;
-import java.util.Set;
-
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-
-import org.cytoscape.app.internal.manager.App;
-
/**
* This class represents the panel in the App Manager dialog's tab used for
checking for app updates.
* Its UI setup code is generated by the Netbeans 7 GUI builder.
Modified:
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/ui/CurrentlyInstalledAppsPanel.java
===================================================================
---
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/ui/CurrentlyInstalledAppsPanel.java
2012-04-23 18:38:12 UTC (rev 28946)
+++
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/ui/CurrentlyInstalledAppsPanel.java
2012-04-23 18:46:35 UTC (rev 28947)
@@ -9,7 +9,6 @@
import org.cytoscape.app.internal.event.AppsChangedEvent;
import org.cytoscape.app.internal.event.AppsChangedListener;
-import org.cytoscape.app.internal.exception.AppMoveException;
import org.cytoscape.app.internal.manager.App;
import org.cytoscape.app.internal.manager.App.AppStatus;
import org.cytoscape.app.internal.manager.AppManager;
Deleted:
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/ui/InstallAppsPanel.java
===================================================================
---
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/ui/InstallAppsPanel.java
2012-04-23 18:38:12 UTC (rev 28946)
+++
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/ui/InstallAppsPanel.java
2012-04-23 18:46:35 UTC (rev 28947)
@@ -1,189 +0,0 @@
-package org.cytoscape.app.internal.ui;
-
-import java.awt.Container;
-import java.io.File;
-import java.util.Collection;
-import java.util.LinkedList;
-
-import javax.swing.JFileChooser;
-import javax.swing.JOptionPane;
-import javax.swing.filechooser.FileFilter;
-
-import org.apache.commons.io.FileUtils;
-import org.cytoscape.app.internal.exception.AppParsingException;
-import org.cytoscape.app.internal.manager.App;
-import org.cytoscape.app.internal.manager.AppManager;
-import org.cytoscape.app.internal.manager.AppParser;
-import org.cytoscape.util.swing.FileChooserFilter;
-import org.cytoscape.util.swing.FileUtil;
-
-public class InstallAppsPanel extends javax.swing.JPanel {
-
- private javax.swing.JComboBox enterUrlComboBox;
- private javax.swing.JLabel enterUrlLabel;
- private javax.swing.JButton installFromFileButton;
- private javax.swing.JLabel installFromFileLabel;
- private javax.swing.JLabel installFromURLLabel;
- private javax.swing.JButton installFromUrlButton;
-
- private AppManager appManager;
- private FileUtil fileUtil;
- private JFileChooser fileChooser;
-
- /**
- * A reference to the parent of this panel used to create the filechooser
dialog.
- */
- private Container parent;
-
- /**
- * Creates new form InstallAppsPanel
- * @param fileUtil
- */
- public InstallAppsPanel(AppManager appManager, FileUtil fileUtil,
Container parent) {
- this.appManager = appManager;
- this.fileUtil = fileUtil;
- this.parent = parent;
- initComponents();
-
- setupFileChooser();
- }
-
- private void initComponents() {
-
- installFromFileButton = new javax.swing.JButton();
- installFromUrlButton = new javax.swing.JButton();
- installFromFileLabel = new javax.swing.JLabel();
- installFromURLLabel = new javax.swing.JLabel();
- enterUrlLabel = new javax.swing.JLabel();
- enterUrlComboBox = new javax.swing.JComboBox();
-
- installFromFileButton.setText("Select File(s)");
- installFromFileButton.addActionListener(new
java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- installFromFileButtonActionPerformed(evt);
- }
- });
-
- installFromUrlButton.setText("Install");
- installFromUrlButton.addActionListener(new
java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- installFromUrlButtonActionPerformed(evt);
- }
- });
-
- installFromFileLabel.setText("Install from File");
-
- installFromURLLabel.setText("Install from URL (for a list of URLs,
separate with semicolon)");
-
- enterUrlLabel.setText("URL(s):");
-
- enterUrlComboBox.setEditable(true);
-
- org.jdesktop.layout.GroupLayout layout = new
org.jdesktop.layout.GroupLayout(this);
- this.setLayout(layout);
- layout.setHorizontalGroup(
- layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(layout.createSequentialGroup()
- .addContainerGap()
-
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(installFromFileLabel)
- .add(installFromFileButton)
- .add(installFromURLLabel)
- .add(layout.createSequentialGroup()
- .add(enterUrlLabel)
-
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(enterUrlComboBox,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 239,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(installFromUrlButton)))
- .addContainerGap(61, Short.MAX_VALUE))
- );
- layout.setVerticalGroup(
- layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(layout.createSequentialGroup()
- .addContainerGap()
- .add(installFromFileLabel)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(installFromFileButton)
- .add(18, 18, 18)
- .add(installFromURLLabel)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(enterUrlLabel)
- .add(enterUrlComboBox,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(installFromUrlButton))
- .addContainerGap(236, Short.MAX_VALUE))
- );
- }
-
- private void
installFromFileButtonActionPerformed(java.awt.event.ActionEvent evt) {
-
- // Setup a the file filter for the open file dialog
- FileChooserFilter fileChooserFilter = new FileChooserFilter("Jar, Zip
Files (*.jar, *.zip)",
- new String[]{"jar", "zip"});
-
- Collection<FileChooserFilter> fileChooserFilters = new
LinkedList<FileChooserFilter>();
- fileChooserFilters.add(fileChooserFilter);
-
- // Show the dialog
- File[] files = fileUtil.getFiles(parent,
- "Choose file(s)", FileUtil.LOAD,
FileUtil.LAST_DIRECTORY, "Install", true, fileChooserFilters);
-
- if (files != null) {
-
- for (int index = 0; index < files.length; index++) {
- AppParser appParser = appManager.getAppParser();
-
- App app = null;
-
- // Attempt to parse each file as an App object
- try {
- app = appParser.parseApp(files[index]);
-
- } catch (AppParsingException e) {
-
- // TODO: Replace System.out.println()
messages with exception or a pop-up message box
- System.out.println("Error parsing app:
" + e.getMessage());
-
- JOptionPane.showMessageDialog(parent,
"Error opening app: " + e.getMessage(),
- "Error", JOptionPane.ERROR_MESSAGE);
- } finally {
-
- // Install the app if parsing was
successful
- if (app != null) {
- appManager.installApp(app);
- }
- }
- }
- }
- }
-
- private void
installFromUrlButtonActionPerformed(java.awt.event.ActionEvent evt) {
- // TODO add your handling code here:
- }
-
- private void setupFileChooser() {
- fileChooser = new JFileChooser();
- fileChooser.setDialogTitle("Select App Files");
- fileChooser.setApproveButtonText("Install");
- fileChooser.setApproveButtonMnemonic('I');
- fileChooser.setMultiSelectionEnabled(true);
-
- fileChooser.addChoosableFileFilter(new FileFilter(){
-
- @Override
- public boolean accept(File file) {
- if (file.getName().endsWith("jar") ||
file.isDirectory()) {
- return true;
- } else {
- return false;
- }
- }
-
- @Override
- public String getDescription() {
- return "Jar-packaged App Files (*.jar)";
- }
-
- });
- }
-}
Modified:
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/ui/InstallFromStorePanel.java
===================================================================
---
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/ui/InstallFromStorePanel.java
2012-04-23 18:38:12 UTC (rev 28946)
+++
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/ui/InstallFromStorePanel.java
2012-04-23 18:46:35 UTC (rev 28947)
@@ -3,52 +3,32 @@
import java.awt.Container;
import java.awt.Desktop;
import java.awt.Font;
-import java.awt.event.ActionEvent;
-import java.awt.event.ComponentEvent;
-import java.awt.event.ComponentListener;
import java.io.File;
import java.io.IOException;
import java.net.URISyntaxException;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
-import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import javax.swing.JFileChooser;
import javax.swing.JOptionPane;
-import javax.swing.RowSorter;
-import javax.swing.ScrollPaneConstants;
-import javax.swing.SwingUtilities;
import javax.swing.UIManager;
import javax.swing.event.HyperlinkEvent;
import javax.swing.event.HyperlinkEvent.EventType;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import javax.swing.event.HyperlinkListener;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-import javax.swing.event.TableModelListener;
-import javax.swing.event.TreeExpansionEvent;
-import javax.swing.event.TreeExpansionListener;
import javax.swing.event.TreeSelectionEvent;
import javax.swing.event.TreeSelectionListener;
-import javax.swing.filechooser.FileFilter;
-import javax.swing.table.AbstractTableModel;
-import javax.swing.table.DefaultTableModel;
-import javax.swing.table.TableModel;
import javax.swing.text.html.HTMLDocument;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.DefaultTreeModel;
-import javax.swing.tree.TreeModel;
-import javax.swing.tree.TreeNode;
import javax.swing.tree.TreePath;
-import org.cytoscape.app.internal.exception.AppMoveException;
import org.cytoscape.app.internal.exception.AppParsingException;
import org.cytoscape.app.internal.manager.App;
import org.cytoscape.app.internal.manager.AppManager;
Modified:
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/ui/InstallFromStorePanelOld.java
===================================================================
---
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/ui/InstallFromStorePanelOld.java
2012-04-23 18:38:12 UTC (rev 28946)
+++
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/main/java/org/cytoscape/app/internal/ui/InstallFromStorePanelOld.java
2012-04-23 18:46:35 UTC (rev 28947)
@@ -1,27 +1,16 @@
package org.cytoscape.app.internal.ui;
-import java.awt.event.ComponentEvent;
-import java.awt.event.ComponentListener;
import java.io.File;
-import java.util.ArrayList;
import java.util.HashSet;
-import java.util.List;
import java.util.Set;
import javax.swing.JFileChooser;
import javax.swing.JOptionPane;
-import javax.swing.RowSorter;
-import javax.swing.ScrollPaneConstants;
import javax.swing.SwingUtilities;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
-import javax.swing.event.TableModelListener;
import javax.swing.filechooser.FileFilter;
-import javax.swing.table.AbstractTableModel;
import javax.swing.table.DefaultTableModel;
-import javax.swing.table.TableModel;
-
-import org.cytoscape.app.internal.exception.AppMoveException;
import org.cytoscape.app.internal.exception.AppParsingException;
import org.cytoscape.app.internal.manager.App;
import org.cytoscape.app.internal.manager.AppManager;
Modified:
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/test/java/org/cytoscape/app/internal/CyAppAdapterImplTest.java
===================================================================
---
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/test/java/org/cytoscape/app/internal/CyAppAdapterImplTest.java
2012-04-23 18:38:12 UTC (rev 28946)
+++
csplugins/trunk/toronto/yuedong/app_manager/impl/app-impl/src/test/java/org/cytoscape/app/internal/CyAppAdapterImplTest.java
2012-04-23 18:46:35 UTC (rev 28947)
@@ -9,7 +9,7 @@
import org.cytoscape.application.CyVersion;
import org.cytoscape.application.CyApplicationManager;
import org.cytoscape.application.swing.CySwingApplication;
-import org.cytoscape.datasource.DataSourceManager;
+import org.cytoscape.io.datasource.DataSourceManager;
import org.cytoscape.event.CyEventHelper;
import org.cytoscape.io.read.CyNetworkReaderManager;
import org.cytoscape.io.read.CyPropertyReaderManager;
--
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.
