r17786 - in csplugins/trunk/soc/jgao/IDMapping: lib src/csplugins/id/mapping src/csplugins/id/mapping/ui

Tue, 11 Aug 2009 22:54:50 -0700 

Author: jgao
Date: 2009-08-11 23:30:00 -0700 (Tue, 11 Aug 2009)
New Revision: 17786

Modified:
   csplugins/trunk/soc/jgao/IDMapping/lib/bridgedb-picr.jar
   
csplugins/trunk/soc/jgao/IDMapping/src/csplugins/id/mapping/PICRIDMappingClient.java
   
csplugins/trunk/soc/jgao/IDMapping/src/csplugins/id/mapping/ui/DataSourceWrapper.java
   
csplugins/trunk/soc/jgao/IDMapping/src/csplugins/id/mapping/ui/WebserviceIDMappingClientConfigDialog.form
   
csplugins/trunk/soc/jgao/IDMapping/src/csplugins/id/mapping/ui/WebserviceIDMappingClientConfigDialog.java
Log:
IDMapperPicrRest

Modified: csplugins/trunk/soc/jgao/IDMapping/lib/bridgedb-picr.jar
===================================================================
(Binary files differ)

Modified: 
csplugins/trunk/soc/jgao/IDMapping/src/csplugins/id/mapping/PICRIDMappingClient.java
===================================================================
--- 
csplugins/trunk/soc/jgao/IDMapping/src/csplugins/id/mapping/PICRIDMappingClient.java
        2009-08-12 03:16:27 UTC (rev 17785)
+++ 
csplugins/trunk/soc/jgao/IDMapping/src/csplugins/id/mapping/PICRIDMappingClient.java
        2009-08-12 06:30:00 UTC (rev 17786)
@@ -35,7 +35,7 @@
 
 package csplugins.id.mapping;
 
-import org.bridgedb.webservice.picr.IDMapperPicr;
+import org.bridgedb.webservice.picr.IDMapperPicrRest;
 import org.bridgedb.IDMapperException;
 
 
@@ -46,10 +46,10 @@
 public class PICRIDMappingClient extends WebserviceIDMappingClient {
 
    public PICRIDMappingClient(final boolean onlyActive) throws 
IDMapperException {
-        this(new IDMapperPicr(onlyActive));
+        this(new IDMapperPicrRest(onlyActive));
     }
 
-    public PICRIDMappingClient(final IDMapperPicr idMapper) {
+    public PICRIDMappingClient(final IDMapperPicrRest idMapper) {
         super("PICR",
                 "PICR web service client",
                 idMapper);

Modified: 
csplugins/trunk/soc/jgao/IDMapping/src/csplugins/id/mapping/ui/DataSourceWrapper.java
===================================================================
--- 
csplugins/trunk/soc/jgao/IDMapping/src/csplugins/id/mapping/ui/DataSourceWrapper.java
       2009-08-12 03:16:27 UTC (rev 17785)
+++ 
csplugins/trunk/soc/jgao/IDMapping/src/csplugins/id/mapping/ui/DataSourceWrapper.java
       2009-08-12 06:30:00 UTC (rev 17786)
@@ -73,21 +73,16 @@
 
         @Override
         public String toString() {
-            StringBuilder sb = new StringBuilder();
             String fullName = ds.getFullName();
+            if (fullName!=null)
+                return fullName;
+
             String sysCode = ds.getSystemCode();
             if (sysCode!=null) {
-                sb.append(sysCode);
-                if (fullName!=null) {
-                    sb.append(":"+fullName);
-                }
-            } else {
-                if (fullName!=null) {
-                    sb.append(fullName);
-                }
-            }
+                return sysCode;
+            } 
 
-            return sb.toString();
+            return null;
         }
 
         public int compareTo(Object obj) {

Modified: 
csplugins/trunk/soc/jgao/IDMapping/src/csplugins/id/mapping/ui/WebserviceIDMappingClientConfigDialog.form
===================================================================
--- 
csplugins/trunk/soc/jgao/IDMapping/src/csplugins/id/mapping/ui/WebserviceIDMappingClientConfigDialog.form
   2009-08-12 03:16:27 UTC (rev 17785)
+++ 
csplugins/trunk/soc/jgao/IDMapping/src/csplugins/id/mapping/ui/WebserviceIDMappingClientConfigDialog.form
   2009-08-12 06:30:00 UTC (rev 17786)
@@ -48,7 +48,7 @@
             <EventHandler event="actionPerformed" 
listener="java.awt.event.ActionListener" 
parameters="java.awt.event.ActionEvent" handler="typeComboBoxActionPerformed"/>
           </Events>
           <AuxValues>
-            <AuxValue name="JavaCodeGenerator_InitCodePre" 
type="java.lang.String" value="ClientType[] types = new 
ClientType[]{ClientType.BIOMART};//TODO &#xa;//ClientType[] types = 
ClientType.values();&#xa;typeComboBox.setModel(new 
javax.swing.DefaultComboBoxModel(types));&#xa;if (idMapper==null) {&#xa;    
&#xa;} else if (idMapper instanceof IDMapperBiomart) {&#xa;    
typeComboBox.setSelectedItem(ClientType.BIOMART);&#xa;    
typeComboBox.setEnabled(false);&#xa;} else if (idMapper instanceof 
IDMapperPicr) {&#xa;    typeComboBox.setSelectedItem(ClientType.PICR);&#xa;    
typeComboBox.setEnabled(false);&#xa;}"/>
+            <AuxValue name="JavaCodeGenerator_InitCodePre" 
type="java.lang.String" value="ClientType[] types = 
ClientType.values();&#xa;typeComboBox.setModel(new 
javax.swing.DefaultComboBoxModel(types));&#xa;if (idMapper==null) {&#xa;    
&#xa;} else if (idMapper instanceof IDMapperBiomart) {&#xa;    
typeComboBox.setSelectedItem(ClientType.BIOMART);&#xa;    
typeComboBox.setEnabled(false);&#xa;} else if (idMapper instanceof 
IDMapperPicr) {&#xa;    typeComboBox.setSelectedItem(ClientType.PICR);&#xa;    
typeComboBox.setEnabled(false);&#xa;}"/>
           </AuxValues>
         </Component>
       </SubComponents>

Modified: 
csplugins/trunk/soc/jgao/IDMapping/src/csplugins/id/mapping/ui/WebserviceIDMappingClientConfigDialog.java
===================================================================
--- 
csplugins/trunk/soc/jgao/IDMapping/src/csplugins/id/mapping/ui/WebserviceIDMappingClientConfigDialog.java
   2009-08-12 03:16:27 UTC (rev 17785)
+++ 
csplugins/trunk/soc/jgao/IDMapping/src/csplugins/id/mapping/ui/WebserviceIDMappingClientConfigDialog.java
   2009-08-12 06:30:00 UTC (rev 17786)
@@ -146,8 +146,7 @@
         
typePanel.setBorder(javax.swing.BorderFactory.createTitledBorder("Select web 
service type"));
         typePanel.setLayout(new javax.swing.BoxLayout(typePanel, 
javax.swing.BoxLayout.LINE_AXIS));
 
-        ClientType[] types = new ClientType[]{ClientType.BIOMART};//TODO
-        //ClientType[] types = ClientType.values();
+        ClientType[] types = ClientType.values();
         typeComboBox.setModel(new javax.swing.DefaultComboBoxModel(types));
         if (idMapper==null) {
 


--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---

Reply via email to