Author: paperwing
Date: 2012-08-29 11:44:08 -0700 (Wed, 29 Aug 2012)
New Revision: 30287
Modified:
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/manager/AppParser.java
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/net/WebApp.java
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/net/WebQuerier.java
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/ui/downloadsites/ManageDownloadSitesDialog.java
Log:
refs #1408. Disabled code for looking for karaf metadata in app jars, app
parsing now much faster for larger apps such as GeneMANIA. No more UI freeze.
Modified:
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/manager/AppParser.java
===================================================================
---
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/manager/AppParser.java
2012-08-29 15:31:56 UTC (rev 30286)
+++
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/manager/AppParser.java
2012-08-29 18:44:08 UTC (rev 30287)
@@ -111,12 +111,14 @@
// Look for features specified in an xml file
+ /*
List<KarafArchiveApp.KarafFeature> featuresList =
Collections.emptyList();
try {
featuresList = getFeaturesXmlFromJar(jarFile);
} catch (AppParsingException e) {
xmlParseFailed = true;
}
+ */
// Check if a manifest that contains OSGi metadata is present
try {
@@ -133,6 +135,11 @@
}
// If an XML parsing error occurred, continue to attempt to
parse the app as a simple app
+ /*
+ *
+ * Commented out, no longer uses Karaf. see if
(osgiMetadataFound) block
+ * below this commented block.
+
if (featuresList.size() > 0 && !xmlParseFailed) {
bundleApp = true;
parsedApp = new KarafArchiveApp();
@@ -144,7 +151,13 @@
bundleApp = true;
parsedApp = new BundleApp();
}
+ */
+ if (osgiMetadataFound) {
+ bundleApp = true;
+ parsedApp = new BundleApp();
+ }
+
// Attempt to obtain manifest file from jar
Manifest manifest = null;
try {
Modified:
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/net/WebApp.java
===================================================================
---
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/net/WebApp.java
2012-08-29 15:31:56 UTC (rev 30286)
+++
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/net/WebApp.java
2012-08-29 18:44:08 UTC (rev 30287)
@@ -67,6 +67,8 @@
@Override
public int compareTo(Release other) {
+// return WebQuerier.compareVersions(other., second)
+
return
releaseDate.compareToIgnoreCase(other.releaseDate);
}
Modified:
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/net/WebQuerier.java
===================================================================
---
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/net/WebQuerier.java
2012-08-29 15:31:56 UTC (rev 30286)
+++
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/net/WebQuerier.java
2012-08-29 18:44:08 UTC (rev 30287)
@@ -679,7 +679,7 @@
* @return A negative integer if first more recent, a positive integer
if second more recent,
* or 0 if the versions were the same or unable to determine which is
more recent.
*/
- public int compareVersions(String first, String second) {
+ public static int compareVersions(String first, String second) {
if (first == null || second == null) {
return 0;
}
Modified:
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/ui/downloadsites/ManageDownloadSitesDialog.java
===================================================================
---
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/ui/downloadsites/ManageDownloadSitesDialog.java
2012-08-29 15:31:56 UTC (rev 30286)
+++
core3/impl/trunk/app-impl/src/main/java/org/cytoscape/app/internal/ui/downloadsites/ManageDownloadSitesDialog.java
2012-08-29 18:44:08 UTC (rev 30287)
@@ -229,9 +229,18 @@
private void addSiteButtonActionPerformed(java.awt.event.ActionEvent evt) {
final DownloadSite downloadSite = new DownloadSite();
- downloadSite.setSiteName(getEnteredSiteName());
- downloadSite.setSiteUrl(getEnteredUrl());
+ String enteredSiteName = getEnteredSiteName();
+ String enteredSiteUrl = getEnteredUrl();
+
+ downloadSite.setSiteName(enteredSiteName);
+ downloadSite.setSiteUrl(enteredSiteUrl);
+
+ if (enteredSiteName.trim().length() == 0
+ || enteredSiteUrl.trim().length() == 0) {
+ return;
+ }
+
downloadSitesManager.addDownloadSite(downloadSite);
if (sitesTable.getModel() instanceof DefaultTableModel) {
--
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.
