Author: kono
Date: 2012-03-09 12:42:49 -0800 (Fri, 09 Mar 2012)
New Revision: 28469
Added:
core3/api/trunk/webservice-swing-api/
core3/api/trunk/webservice-swing-api/src/
core3/api/trunk/webservice-swing-api/src/main/
core3/api/trunk/webservice-swing-api/src/main/java/
core3/api/trunk/webservice-swing-api/src/main/java/org/
core3/api/trunk/webservice-swing-api/src/main/java/org/cytoscape/
core3/api/trunk/webservice-swing-api/src/main/java/org/cytoscape/io/
core3/api/trunk/webservice-swing-api/src/main/java/org/cytoscape/io/webservice/
core3/api/trunk/webservice-swing-api/src/main/java/org/cytoscape/io/webservice/swing/
core3/api/trunk/webservice-swing-api/src/main/java/org/cytoscape/io/webservice/swing/AbstractWebServiceGUIClient.java
core3/api/trunk/webservice-swing-api/src/main/java/org/cytoscape/io/webservice/swing/WebServiceGUIClient.java
core3/api/trunk/webservice-swing-api/src/main/java/org/cytoscape/io/webservice/swing/package-info.java
core3/api/trunk/webservice-swing-api/src/test/
core3/api/trunk/webservice-swing-api/src/test/java/
Modified:
core3/api/trunk/pom.xml
core3/api/trunk/webservice-api/src/main/java/org/cytoscape/io/webservice/WebServiceClient.java
core3/api/trunk/webservice-api/src/main/java/org/cytoscape/io/webservice/client/AbstractWebServiceClient.java
core3/gui-distribution/trunk/features/src/main/resources/features.xml
core3/impl/trunk/cpath2-impl/pom.xml
core3/impl/trunk/cpath2-impl/src/main/java/org/cytoscape/cpath2/internal/web_service/CytoscapeCPathWebService.java
core3/impl/trunk/webservice-biomart-client-impl/pom.xml
core3/impl/trunk/webservice-biomart-client-impl/src/main/java/org/cytoscape/io/webservice/biomart/BiomartClient.java
core3/impl/trunk/webservice-impl/pom.xml
core3/impl/trunk/webservice-impl/src/main/java/org/cytoscape/webservice/internal/ui/WebServiceImportDialog.java
core3/impl/trunk/webservice-psicquic-client-impl/pom.xml
core3/impl/trunk/webservice-psicquic-client-impl/src/main/java/org/cytoscape/webservice/psicquic/PSICQUICWebServiceClient.java
Log:
refs #751 AWT/Swing dependency had been moved to webservice-swing-api.
Modified: core3/api/trunk/pom.xml
===================================================================
--- core3/api/trunk/pom.xml 2012-03-09 20:17:54 UTC (rev 28468)
+++ core3/api/trunk/pom.xml 2012-03-09 20:42:49 UTC (rev 28469)
@@ -39,6 +39,7 @@
<module>application-api</module>
<module>datasource-api</module>
<module>group-api</module>
+ <module>webservice-swing-api</module>
</modules>
<dependencyManagement>
@@ -86,4 +87,4 @@
</plugins>
</build>
-</project>
+</project>
\ No newline at end of file
Modified:
core3/api/trunk/webservice-api/src/main/java/org/cytoscape/io/webservice/WebServiceClient.java
===================================================================
---
core3/api/trunk/webservice-api/src/main/java/org/cytoscape/io/webservice/WebServiceClient.java
2012-03-09 20:17:54 UTC (rev 28468)
+++
core3/api/trunk/webservice-api/src/main/java/org/cytoscape/io/webservice/WebServiceClient.java
2012-03-09 20:42:49 UTC (rev 28469)
@@ -34,12 +34,8 @@
*/
package org.cytoscape.io.webservice;
-import java.awt.Container;
import java.net.URI;
-import javax.swing.JPanel;
-
-import org.cytoscape.work.ProvidesGUI;
import org.cytoscape.work.TaskFactory;
/**
@@ -76,17 +72,8 @@
* return value.
*/
String getDescription();
-
- /**
- * Returns query builder UI. Since this is a TaskFactory,
- * createTaskIterator() method should use parameters from this GUI.
- *
- * @return query builder UI.
- */
- Container getQueryBuilderGUI();
-
/**
* Set query for the tasks to be executed.
*
Modified:
core3/api/trunk/webservice-api/src/main/java/org/cytoscape/io/webservice/client/AbstractWebServiceClient.java
===================================================================
---
core3/api/trunk/webservice-api/src/main/java/org/cytoscape/io/webservice/client/AbstractWebServiceClient.java
2012-03-09 20:17:54 UTC (rev 28468)
+++
core3/api/trunk/webservice-api/src/main/java/org/cytoscape/io/webservice/client/AbstractWebServiceClient.java
2012-03-09 20:42:49 UTC (rev 28469)
@@ -34,12 +34,9 @@
*/
package org.cytoscape.io.webservice.client;
-import java.awt.Container;
import java.net.URI;
import java.net.URISyntaxException;
-import javax.swing.JPanel;
-
import org.cytoscape.io.webservice.WebServiceClient;
@@ -51,19 +48,15 @@
*/
public abstract class AbstractWebServiceClient implements WebServiceClient {
- /** Service location */
+ // Globally-unique service location.
protected final URI serviceURI;
// Display Name for this client.
private final String displayName;
private final String description;
- // By default, this is null.
- protected JPanel panel;
-
- protected Object currentQuery = null;
+ protected Object currentQuery;
-
/**
* Constructs this AbstractWebServiceClient.
* @param uri Service Location.
@@ -101,12 +94,6 @@
public URI getServiceLocation() {
return this.serviceURI;
}
-
-
- @Override
- public Container getQueryBuilderGUI() {
- return panel;
- }
@Override public void setQuery(Object query) {
Added:
core3/api/trunk/webservice-swing-api/src/main/java/org/cytoscape/io/webservice/swing/AbstractWebServiceGUIClient.java
===================================================================
---
core3/api/trunk/webservice-swing-api/src/main/java/org/cytoscape/io/webservice/swing/AbstractWebServiceGUIClient.java
(rev 0)
+++
core3/api/trunk/webservice-swing-api/src/main/java/org/cytoscape/io/webservice/swing/AbstractWebServiceGUIClient.java
2012-03-09 20:42:49 UTC (rev 28469)
@@ -0,0 +1,25 @@
+package org.cytoscape.io.webservice.swing;
+
+import java.awt.Container;
+
+import org.cytoscape.io.webservice.client.AbstractWebServiceClient;
+
+/**
+ * Abstract class for web service client with Swing GUI.
+ *
+ */
+public abstract class AbstractWebServiceGUIClient extends
AbstractWebServiceClient implements WebServiceGUIClient {
+
+ // Client GUI. If this is null, default GUI will be used.
+ protected Container gui;
+
+ public AbstractWebServiceGUIClient(final String uri, final String
displayName, final String description) {
+ super(uri, displayName, description);
+ }
+
+ @Override
+ public Container getQueryBuilderGUI() {
+ return gui;
+ }
+
+}
Added:
core3/api/trunk/webservice-swing-api/src/main/java/org/cytoscape/io/webservice/swing/WebServiceGUIClient.java
===================================================================
---
core3/api/trunk/webservice-swing-api/src/main/java/org/cytoscape/io/webservice/swing/WebServiceGUIClient.java
(rev 0)
+++
core3/api/trunk/webservice-swing-api/src/main/java/org/cytoscape/io/webservice/swing/WebServiceGUIClient.java
2012-03-09 20:42:49 UTC (rev 28469)
@@ -0,0 +1,14 @@
+package org.cytoscape.io.webservice.swing;
+
+import java.awt.Container;
+
+public interface WebServiceGUIClient {
+ /**
+ * Returns query builder UI. Since this is a TaskFactory,
+ * createTaskIterator() method should use parameters from this GUI.
+ *
+ * @return query builder UI.
+ */
+ Container getQueryBuilderGUI();
+
+}
Added:
core3/api/trunk/webservice-swing-api/src/main/java/org/cytoscape/io/webservice/swing/package-info.java
===================================================================
---
core3/api/trunk/webservice-swing-api/src/main/java/org/cytoscape/io/webservice/swing/package-info.java
(rev 0)
+++
core3/api/trunk/webservice-swing-api/src/main/java/org/cytoscape/io/webservice/swing/package-info.java
2012-03-09 20:42:49 UTC (rev 28469)
@@ -0,0 +1,4 @@
+/**
+ * Web Service Clients with Swing GUI.
+ */
+package org.cytoscape.io.webservice.swing;
\ No newline at end of file
Modified: core3/gui-distribution/trunk/features/src/main/resources/features.xml
===================================================================
--- core3/gui-distribution/trunk/features/src/main/resources/features.xml
2012-03-09 20:17:54 UTC (rev 28468)
+++ core3/gui-distribution/trunk/features/src/main/resources/features.xml
2012-03-09 20:42:49 UTC (rev 28469)
@@ -80,6 +80,7 @@
<bundle
start-level="110">mvn:org.cytoscape/presentation-api/${cytoscape.api.version}</bundle>
<bundle
start-level="110">mvn:org.cytoscape/property-api/${cytoscape.api.version}</bundle>
<bundle
start-level="110">mvn:org.cytoscape/webservice-api/${cytoscape.api.version}</bundle>
+ <bundle
start-level="110">mvn:org.cytoscape/webservice-swing-api/${cytoscape.api.version}</bundle>
<bundle
start-level="110">mvn:org.cytoscape/application-api/${cytoscape.api.version}</bundle>
<bundle
start-level="110">mvn:org.cytoscape/datasource-api/${cytoscape.api.version}</bundle>
Modified: core3/impl/trunk/cpath2-impl/pom.xml
===================================================================
--- core3/impl/trunk/cpath2-impl/pom.xml 2012-03-09 20:17:54 UTC (rev
28468)
+++ core3/impl/trunk/cpath2-impl/pom.xml 2012-03-09 20:42:49 UTC (rev
28469)
@@ -25,10 +25,11 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.cytoscape</groupId>
- <artifactId>webservice-api</artifactId>
- <scope>provided</scope>
- </dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>webservice-swing-api</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>viewmodel-api</artifactId>
Modified:
core3/impl/trunk/cpath2-impl/src/main/java/org/cytoscape/cpath2/internal/web_service/CytoscapeCPathWebService.java
===================================================================
---
core3/impl/trunk/cpath2-impl/src/main/java/org/cytoscape/cpath2/internal/web_service/CytoscapeCPathWebService.java
2012-03-09 20:17:54 UTC (rev 28468)
+++
core3/impl/trunk/cpath2-impl/src/main/java/org/cytoscape/cpath2/internal/web_service/CytoscapeCPathWebService.java
2012-03-09 20:42:49 UTC (rev 28469)
@@ -17,7 +17,7 @@
import org.cytoscape.cpath2.internal.view.cPathSearchPanel;
import org.cytoscape.io.webservice.NetworkImportWebServiceClient;
import org.cytoscape.io.webservice.SearchWebServiceClient;
-import org.cytoscape.io.webservice.client.AbstractWebServiceClient;
+import org.cytoscape.io.webservice.swing.AbstractWebServiceGUIClient;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNode;
import org.cytoscape.view.model.View;
@@ -27,7 +27,7 @@
/**
* CPath Web Service, integrated into the Cytoscape Web Services Framework.
*/
-public class CytoscapeCPathWebService extends AbstractWebServiceClient
+public class CytoscapeCPathWebService extends AbstractWebServiceGUIClient
implements NetworkImportWebServiceClient,
SearchWebServiceClient<Object>
{
// Display name of this client.
Modified: core3/impl/trunk/webservice-biomart-client-impl/pom.xml
===================================================================
--- core3/impl/trunk/webservice-biomart-client-impl/pom.xml 2012-03-09
20:17:54 UTC (rev 28468)
+++ core3/impl/trunk/webservice-biomart-client-impl/pom.xml 2012-03-09
20:42:49 UTC (rev 28469)
@@ -91,7 +91,8 @@
<!-- Cytoscape modules -->
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>webservice-api</artifactId>
+ <artifactId>webservice-swing-api</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
Modified:
core3/impl/trunk/webservice-biomart-client-impl/src/main/java/org/cytoscape/io/webservice/biomart/BiomartClient.java
===================================================================
---
core3/impl/trunk/webservice-biomart-client-impl/src/main/java/org/cytoscape/io/webservice/biomart/BiomartClient.java
2012-03-09 20:17:54 UTC (rev 28468)
+++
core3/impl/trunk/webservice-biomart-client-impl/src/main/java/org/cytoscape/io/webservice/biomart/BiomartClient.java
2012-03-09 20:42:49 UTC (rev 28469)
@@ -39,20 +39,21 @@
import org.cytoscape.io.webservice.biomart.rest.BiomartRestClient;
import org.cytoscape.io.webservice.biomart.task.ImportTableTask;
import org.cytoscape.io.webservice.biomart.ui.BiomartAttrMappingPanel;
-import org.cytoscape.io.webservice.client.AbstractWebServiceClient;
+import org.cytoscape.io.webservice.swing.AbstractWebServiceGUIClient;
import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.model.CyTable;
import org.cytoscape.model.CyTableFactory;
import org.cytoscape.model.CyTableManager;
import org.cytoscape.model.subnetwork.CyRootNetworkManager;
import org.cytoscape.work.TaskIterator;
+import org.osgi.framework.ServiceException;
/**
* Biomart Web Service Client.
*
*/
-public class BiomartClient extends AbstractWebServiceClient implements
TableImportWebServiceClient {
+public class BiomartClient extends AbstractWebServiceGUIClient implements
TableImportWebServiceClient {
private final CyTableFactory tableFactory;
private final BiomartRestClient restClient;
private ImportTableTask importTask;
@@ -85,7 +86,7 @@
this.tableManager = tableManager;
this.cyRootNetworkFactory = cyRootNetworkFactory;
- this.panel = gui;
+ this.gui = gui;
// TODO: set optional parameters (Tunables?)
}
@@ -105,11 +106,11 @@
@Override
public TaskIterator createTaskIterator() {
- if (panel == null)
+ if (gui == null)
throw new IllegalStateException(
"Could not build query because Query
Builder GUI is null.");
- final BiomartQuery query = ((BiomartAttrMappingPanel)
panel).getTableImportQuery();
+ final BiomartQuery query = ((BiomartAttrMappingPanel)
gui).getTableImportQuery();
importTask = new ImportTableTask(restClient, query,
tableFactory, networkManager,
applicationManager,
app.getJFrame(), tableManager,
Modified: core3/impl/trunk/webservice-impl/pom.xml
===================================================================
--- core3/impl/trunk/webservice-impl/pom.xml 2012-03-09 20:17:54 UTC (rev
28468)
+++ core3/impl/trunk/webservice-impl/pom.xml 2012-03-09 20:42:49 UTC (rev
28469)
@@ -87,7 +87,8 @@
<dependencies>
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>webservice-api</artifactId>
+ <artifactId>webservice-swing-api</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
Modified:
core3/impl/trunk/webservice-impl/src/main/java/org/cytoscape/webservice/internal/ui/WebServiceImportDialog.java
===================================================================
---
core3/impl/trunk/webservice-impl/src/main/java/org/cytoscape/webservice/internal/ui/WebServiceImportDialog.java
2012-03-09 20:17:54 UTC (rev 28468)
+++
core3/impl/trunk/webservice-impl/src/main/java/org/cytoscape/webservice/internal/ui/WebServiceImportDialog.java
2012-03-09 20:42:49 UTC (rev 28469)
@@ -28,8 +28,8 @@
import javax.swing.WindowConstants;
import org.cytoscape.io.webservice.WebServiceClient;
+import org.cytoscape.io.webservice.swing.WebServiceGUIClient;
import org.cytoscape.util.swing.OpenBrowser;
-import org.cytoscape.util.swing.internal.OpenBrowserImpl;
import org.cytoscape.work.TaskManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -114,8 +114,8 @@
numClients++;
setComponentsEnabled(true);
- if (client instanceof WebServiceClient) {
- WebServiceClient service = (WebServiceClient) client;
+ if (client instanceof WebServiceGUIClient) {
+ WebServiceGUIClient service = (WebServiceGUIClient)
client;
Container container = service.getQueryBuilderGUI();
if (container != null) {
serviceUIPanels.put((WebServiceClient) client,
container);
Modified: core3/impl/trunk/webservice-psicquic-client-impl/pom.xml
===================================================================
--- core3/impl/trunk/webservice-psicquic-client-impl/pom.xml 2012-03-09
20:17:54 UTC (rev 28468)
+++ core3/impl/trunk/webservice-psicquic-client-impl/pom.xml 2012-03-09
20:42:49 UTC (rev 28469)
@@ -69,7 +69,8 @@
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
- <artifactId>webservice-api</artifactId>
+ <artifactId>webservice-swing-api</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
Modified:
core3/impl/trunk/webservice-psicquic-client-impl/src/main/java/org/cytoscape/webservice/psicquic/PSICQUICWebServiceClient.java
===================================================================
---
core3/impl/trunk/webservice-psicquic-client-impl/src/main/java/org/cytoscape/webservice/psicquic/PSICQUICWebServiceClient.java
2012-03-09 20:17:54 UTC (rev 28468)
+++
core3/impl/trunk/webservice-psicquic-client-impl/src/main/java/org/cytoscape/webservice/psicquic/PSICQUICWebServiceClient.java
2012-03-09 20:42:49 UTC (rev 28469)
@@ -16,7 +16,7 @@
import org.cytoscape.io.webservice.NetworkImportWebServiceClient;
import org.cytoscape.io.webservice.SearchWebServiceClient;
-import org.cytoscape.io.webservice.client.AbstractWebServiceClient;
+import org.cytoscape.io.webservice.swing.AbstractWebServiceGUIClient;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNetworkFactory;
import org.cytoscape.model.CyNetworkManager;
@@ -31,7 +31,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class PSICQUICWebServiceClient extends AbstractWebServiceClient
implements NetworkImportWebServiceClient,
+public class PSICQUICWebServiceClient extends AbstractWebServiceGUIClient
implements NetworkImportWebServiceClient,
SearchWebServiceClient<Set<String>> {
private static final Logger logger =
LoggerFactory.getLogger(PSICQUICWebServiceClient.class);
--
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.
