Author: paperwing
Date: 2012-08-21 09:57:37 -0700 (Tue, 21 Aug 2012)
New Revision: 30241
Modified:
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/manager/AppManager.java
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/ui/AppManagerDialog.java
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/ui/CurrentlyInstalledAppsPanel.java
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/ui/InstallFromStorePanel.java
Log:
refs #1361 Installing apps from file sets the tabbedPane to Currently
Installed. Feedback for app store installed apps is given by a tag next to the
app name showing that it is installed.
Modified:
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/manager/AppManager.java
===================================================================
---
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/manager/AppManager.java
2012-08-21 00:33:04 UTC (rev 30240)
+++
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/manager/AppManager.java
2012-08-21 16:57:37 UTC (rev 30241)
@@ -784,28 +784,6 @@
}
}
- private void installAppsInDirectory(File directory, boolean
ignoreDuplicateBundleApps) {
- // Temporary fix to get the App Manager working--this should be
removed later (Samad)
- if (!directory.exists()) {
- logger.error("Attempting to load from a directory that does not
exist: " + directory.getAbsolutePath());
- return;
- }
-
- // Parse App objects from the given directory
- Set<App> parsedApps = obtainAppsFromDirectory(directory,
ignoreDuplicateBundleApps);
-
- // Install each app
- for (App parsedApp : parsedApps) {
- try {
- installApp(parsedApp);
- } catch (AppInstallException e) {
- logger.warn("Unable to install app from
installed apps directory: " + e.getMessage());
- }
- }
-
- DebugHelper.print("Number of apps installed from directory: " +
parsedApps.size());
- }
-
/**
* Obtain a set of {@link App} objects through attempting to parse
files found in the first level of the given directory.
* @param directory The directory used to parse {@link App} objects
Modified:
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/ui/AppManagerDialog.java
===================================================================
---
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/ui/AppManagerDialog.java
2012-08-21 00:33:04 UTC (rev 30240)
+++
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/ui/AppManagerDialog.java
2012-08-21 16:57:37 UTC (rev 30241)
@@ -1,5 +1,7 @@
package org.cytoscape.app.internal.ui;
+import org.cytoscape.app.internal.event.AppsChangedEvent;
+import org.cytoscape.app.internal.event.AppsChangedListener;
import org.cytoscape.app.internal.manager.AppManager;
import org.cytoscape.util.swing.FileUtil;
import org.cytoscape.work.TaskManager;
@@ -59,7 +61,11 @@
.addComponent(mainTabbedPane,
javax.swing.GroupLayout.DEFAULT_SIZE, 490, Short.MAX_VALUE)
.addContainerGap())
);
-
+
pack();
}
+
+ public void changeTab(int index) {
+ mainTabbedPane.setSelectedIndex(index);
+ }
}
Modified:
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/ui/CurrentlyInstalledAppsPanel.java
===================================================================
---
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/ui/CurrentlyInstalledAppsPanel.java
2012-08-21 00:33:04 UTC (rev 30240)
+++
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/ui/CurrentlyInstalledAppsPanel.java
2012-08-21 16:57:37 UTC (rev 30241)
@@ -116,7 +116,10 @@
descriptionLabel.setText("App Information:");
+
descriptionScrollPane.setHorizontalScrollBarPolicy(javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
+
descriptionTextArea.setEditable(false);
+ descriptionTextArea.setLineWrap(true);
descriptionTextArea.setFocusable(false);
descriptionScrollPane.setViewportView(descriptionTextArea);
Modified:
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/ui/InstallFromStorePanel.java
===================================================================
---
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/ui/InstallFromStorePanel.java
2012-08-21 00:33:04 UTC (rev 30240)
+++
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/ui/InstallFromStorePanel.java
2012-08-21 16:57:37 UTC (rev 30241)
@@ -24,6 +24,7 @@
import javax.swing.ComboBoxEditor;
import javax.swing.DefaultComboBoxModel;
import javax.swing.JFileChooser;
+import javax.swing.JOptionPane;
import javax.swing.JTree;
import javax.swing.SwingUtilities;
import javax.swing.UIManager;
@@ -462,8 +463,12 @@
app = appParser.parseApp(files[index]);
appManager.installApp(app);
}
+
+ taskMonitor.setProgress(1.0);
- taskMonitor.setProgress(1.0);
+ if (parent instanceof AppManagerDialog) {
+ ((AppManagerDialog) parent).changeTab(1);
+ }
}
@Override
--
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.
