Author: jgao
Date: 2009-07-20 13:36:34 -0700 (Mon, 20 Jul 2009)
New Revision: 17490
Added:
csplugins/trunk/soc/jgao/IDMapping/lib/bridgedb-bio.jar
csplugins/trunk/soc/jgao/IDMapping/lib/bridgedb.jar
csplugins/trunk/soc/jgao/IDMapping/lib/derby.jar
Modified:
csplugins/trunk/soc/jgao/IDMapping/build.xml
csplugins/trunk/soc/jgao/IDMapping/lib/
csplugins/trunk/soc/jgao/IDMapping/src/csplugins/id/mapping/ui/CyThesaurusDialog.java
csplugins/trunk/soc/jgao/IDMapping/src/csplugins/id/mapping/ui/DelimitedTextIDMappingClientConfigDialog.form
csplugins/trunk/soc/jgao/IDMapping/src/csplugins/id/mapping/ui/DelimitedTextIDMappingClientConfigDialog.java
csplugins/trunk/soc/jgao/IDMapping/src/csplugins/id/mapping/ui/SourceAttributeSelectionTable.java
csplugins/trunk/soc/jgao/IDMapping/src/csplugins/id/mapping/ui/TargetAttributeSelectionTable.java
Log:
Add lib,
Reflesh supported data source after updating the data source tree
Modified: csplugins/trunk/soc/jgao/IDMapping/build.xml
===================================================================
--- csplugins/trunk/soc/jgao/IDMapping/build.xml 2009-07-20 19:37:13 UTC
(rev 17489)
+++ csplugins/trunk/soc/jgao/IDMapping/build.xml 2009-07-20 20:36:34 UTC
(rev 17490)
@@ -11,9 +11,28 @@
<property name="src" location="src"/>
<property name="images" value="images"/>
<property name="lib" location="lib"/>
+ <property name="cyrelease" value="lib"/>
+ <property name="cylib" value = "lib"/>
<property name="build" location="build"/>
<property name="build.classes" location="${build}/classes"/>
<property name="build.images" location="${build.classes}/images"/>
+
+ <!-- Classpath with all lib JAR Files and all Cytoscape Core classes -->
+ <path id="classpath">
+ <fileset dir="${cylib}">
+ <include name="giny.jar"/>
+ <include name="cytoscape-task.jar"/>
+ </fileset>
+ <!-- include cytoscape.jar, which is it release directory top
level -->
+ <fileset dir="${cyrelease}">
+ <include name="cytoscape.jar"/>
+ </fileset>
+ <fileset dir="${lib}">
+ <include name="bridgedb.jar"/>
+ <include name="bridgedb-bio.jar"/>
+ </fileset>
+ </path>
+
</target>
<!-- =================================================================== -->
@@ -23,13 +42,7 @@
<mkdir dir="${build}"/>
<mkdir dir="${build.classes}"/>
<javac srcdir="${src}" destdir="${build.classes}">
- <classpath>
- <pathelement location="lib/giny.jar"/>
- <pathelement location="lib/cytoscape.jar"/>
- <pathelement location="lib/cytoscape-task.jar"/>
- <pathelement location="lib/bridgedb.jar"/>
- <pathelement location="lib/bridgedb-bio.jar"/>
- </classpath>
+ <classpath refid="classpath"/>
</javac>
</target>
Property changes on: csplugins/trunk/soc/jgao/IDMapping/lib
___________________________________________________________________
Name: svn:ignore
- cytoscape-task.jar
cytoscape.jar
giny.jar
BridgeDbCore.jar
derby.jar
BridgeDbBio.jar
bridgedb-bio.jar
bridgedb.jar
+ cytoscape-task.jar
cytoscape.jar
giny.jar
BridgeDbCore.jar
BridgeDbBio.jar
Added: csplugins/trunk/soc/jgao/IDMapping/lib/bridgedb-bio.jar
===================================================================
(Binary files differ)
Property changes on: csplugins/trunk/soc/jgao/IDMapping/lib/bridgedb-bio.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: csplugins/trunk/soc/jgao/IDMapping/lib/bridgedb.jar
===================================================================
(Binary files differ)
Property changes on: csplugins/trunk/soc/jgao/IDMapping/lib/bridgedb.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: csplugins/trunk/soc/jgao/IDMapping/lib/derby.jar
===================================================================
(Binary files differ)
Property changes on: csplugins/trunk/soc/jgao/IDMapping/lib/derby.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified:
csplugins/trunk/soc/jgao/IDMapping/src/csplugins/id/mapping/ui/CyThesaurusDialog.java
===================================================================
---
csplugins/trunk/soc/jgao/IDMapping/src/csplugins/id/mapping/ui/CyThesaurusDialog.java
2009-07-20 19:37:13 UTC (rev 17489)
+++
csplugins/trunk/soc/jgao/IDMapping/src/csplugins/id/mapping/ui/CyThesaurusDialog.java
2009-07-20 20:36:34 UTC (rev 17490)
@@ -425,10 +425,7 @@
if (!srcConfDialog.isCancelled()) {
Set<DataSource>[] types = this.getSupportedType();
sourceAttributeSelectionTable.setSupportedIDType(types[0]);
- sourceAttributeSelectionTable.repaint();
-
targetAttributeSelectionTable.setSupportedIDType(types[1]);
- targetAttributeSelectionTable.repaint();
}
}//GEN-LAST:event_srcConfBtnActionPerformed
Modified:
csplugins/trunk/soc/jgao/IDMapping/src/csplugins/id/mapping/ui/DelimitedTextIDMappingClientConfigDialog.form
===================================================================
---
csplugins/trunk/soc/jgao/IDMapping/src/csplugins/id/mapping/ui/DelimitedTextIDMappingClientConfigDialog.form
2009-07-20 19:37:13 UTC (rev 17489)
+++
csplugins/trunk/soc/jgao/IDMapping/src/csplugins/id/mapping/ui/DelimitedTextIDMappingClientConfigDialog.form
2009-07-20 20:36:34 UTC (rev 17490)
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8" ?>
<Form version="1.5" maxVersion="1.7"
type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
+ <NonVisualComponents>
+ <Component class="javax.swing.ButtonGroup" name="buttonGroup1">
+ </Component>
+ </NonVisualComponents>
<Properties>
<Property name="defaultCloseOperation" type="int" value="2"/>
<Property name="title" type="java.lang.String" value="Add a ID Mapping
Source From File"/>
@@ -59,6 +63,9 @@
</Component>
<Component class="javax.swing.JRadioButton"
name="localRadioButton">
<Properties>
+ <Property name="buttonGroup" type="javax.swing.ButtonGroup"
editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
+ <ComponentRef name="buttonGroup1"/>
+ </Property>
<Property name="selected" type="boolean" value="true"/>
<Property name="text" type="java.lang.String" value="Local
"/>
</Properties>
@@ -68,6 +75,9 @@
</Component>
<Component class="javax.swing.JRadioButton"
name="remoteRadioButton">
<Properties>
+ <Property name="buttonGroup" type="javax.swing.ButtonGroup"
editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
+ <ComponentRef name="buttonGroup1"/>
+ </Property>
<Property name="text" type="java.lang.String"
value="Remote/URL"/>
</Properties>
<Events>
Modified:
csplugins/trunk/soc/jgao/IDMapping/src/csplugins/id/mapping/ui/DelimitedTextIDMappingClientConfigDialog.java
===================================================================
---
csplugins/trunk/soc/jgao/IDMapping/src/csplugins/id/mapping/ui/DelimitedTextIDMappingClientConfigDialog.java
2009-07-20 19:37:13 UTC (rev 17489)
+++
csplugins/trunk/soc/jgao/IDMapping/src/csplugins/id/mapping/ui/DelimitedTextIDMappingClientConfigDialog.java
2009-07-20 20:36:34 UTC (rev 17490)
@@ -110,6 +110,7 @@
private void initComponents() {
java.awt.GridBagConstraints gridBagConstraints;
+ buttonGroup1 = new javax.swing.ButtonGroup();
textFilePanel = new javax.swing.JPanel();
sourcePanel = new javax.swing.JPanel();
javax.swing.JLabel typeLabel = new javax.swing.JLabel();
@@ -156,6 +157,7 @@
typeLabel.setText("File type: ");
sourcePanel.add(typeLabel);
+ buttonGroup1.add(localRadioButton);
localRadioButton.setSelected(true);
localRadioButton.setText("Local ");
localRadioButton.addActionListener(new java.awt.event.ActionListener()
{
@@ -165,6 +167,7 @@
});
sourcePanel.add(localRadioButton);
+ buttonGroup1.add(remoteRadioButton);
remoteRadioButton.setText("Remote/URL");
remoteRadioButton.addActionListener(new
java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -856,6 +859,7 @@
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JPanel advancedPanel;
+ private javax.swing.ButtonGroup buttonGroup1;
private javax.swing.JButton cancelButton;
private javax.swing.JCheckBox commaIDCheckBox;
private javax.swing.JCheckBox commaTypeCheckBox;
Modified:
csplugins/trunk/soc/jgao/IDMapping/src/csplugins/id/mapping/ui/SourceAttributeSelectionTable.java
===================================================================
---
csplugins/trunk/soc/jgao/IDMapping/src/csplugins/id/mapping/ui/SourceAttributeSelectionTable.java
2009-07-20 19:37:13 UTC (rev 17489)
+++
csplugins/trunk/soc/jgao/IDMapping/src/csplugins/id/mapping/ui/SourceAttributeSelectionTable.java
2009-07-20 20:36:34 UTC (rev 17490)
@@ -87,7 +87,7 @@
private int rowCount;
- private final String colHeaderAtt = "Attribute";
+ private final String colHeaderAtt = "Key Attribute";
private final String colHeaderSrc = "Source ID Type(s)";
private final String colHeaderBtn = " ";
@@ -138,7 +138,7 @@
}
});
- setPreferredColumnWidths(new double[]{0.4,0.5,0.1});
+ setPreferredColumnWidths(new double[]{0.5,0.4,0.1});
setColumnEditorAndCellRenderer();
}
@@ -157,8 +157,11 @@
for (int i=0; i<rowCount; i++) {
typeComboBoxes.add(new CheckComboBox(supportedIDType, false));
}
+
+ //TODO: select the id type previously selected
+
+ model.fireTableStructureChanged();
setColumnEditorAndCellRenderer();
- //fireTableDataChanged();
}
public Map<String,Set<DataSource>> getSourceNetAttrType() {
@@ -337,7 +340,7 @@
}
private class IDTypeSelectionTableModel extends AbstractTableModel {
- private final String[] columnNames = {colHeaderAtt, colHeaderSrc,
colHeaderBtn};
+ private final String[] columnNames = {colHeaderSrc, colHeaderAtt,
colHeaderBtn};
//@Override
public int getColumnCount() {
Modified:
csplugins/trunk/soc/jgao/IDMapping/src/csplugins/id/mapping/ui/TargetAttributeSelectionTable.java
===================================================================
---
csplugins/trunk/soc/jgao/IDMapping/src/csplugins/id/mapping/ui/TargetAttributeSelectionTable.java
2009-07-20 19:37:13 UTC (rev 17489)
+++
csplugins/trunk/soc/jgao/IDMapping/src/csplugins/id/mapping/ui/TargetAttributeSelectionTable.java
2009-07-20 20:36:34 UTC (rev 17490)
@@ -86,8 +86,8 @@
private JButton addBtn;
private final String headerIDType = "Target ID Type";
- private final String headerAttrName = "New attribute name";
- private final String headerAttrType = "Attribute type";
+ private final String headerAttrName = "Target New Attribute";
+ private final String headerAttrType = "Attribute Type";
private final String headerBtn = " ";
private final String stringAttrType = "String";
@@ -165,8 +165,10 @@
idTypeComboBoxes.add(new JComboBox(new Vector(supportedIDType)));
}
+ //TODO: select the id type previously selected
+
+ model.fireTableStructureChanged();
setColumnEditorAndCellRenderer();
- //fireTableDataChanged();
}
private String getAttrName(int row) {
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
